diff --git a/Podfile b/Podfile
new file mode 100644
index 0000000..2859da7
--- /dev/null
+++ b/Podfile
@@ -0,0 +1,11 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '9.0'
+
+target 'Popcat' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for Popcat
+  pod 'MaterialComponents/BottomSheet'
+
+end
diff --git a/Podfile.lock b/Podfile.lock
new file mode 100644
index 0000000..fc3be90
--- /dev/null
+++ b/Podfile.lock
@@ -0,0 +1,44 @@
+PODS:
+  - MaterialComponents/Availability (124.2.0)
+  - MaterialComponents/BottomSheet (124.2.0):
+    - MaterialComponents/Elevation
+    - MaterialComponents/private/KeyboardWatcher
+    - MaterialComponents/private/Math
+    - MaterialComponents/ShadowElevations
+    - MaterialComponents/ShadowLayer
+    - MaterialComponents/ShapeLibrary
+    - MaterialComponents/Shapes
+  - MaterialComponents/Elevation (124.2.0):
+    - MaterialComponents/Availability
+    - MaterialComponents/private/Color
+    - MaterialComponents/private/Math
+  - MaterialComponents/private/Application (124.2.0)
+  - MaterialComponents/private/Color (124.2.0):
+    - MaterialComponents/Availability
+  - MaterialComponents/private/KeyboardWatcher (124.2.0):
+    - MaterialComponents/private/Application
+  - MaterialComponents/private/Math (124.2.0)
+  - MaterialComponents/ShadowElevations (124.2.0)
+  - MaterialComponents/ShadowLayer (124.2.0):
+    - MaterialComponents/ShadowElevations
+  - MaterialComponents/ShapeLibrary (124.2.0):
+    - MaterialComponents/private/Math
+    - MaterialComponents/Shapes
+  - MaterialComponents/Shapes (124.2.0):
+    - MaterialComponents/private/Color
+    - MaterialComponents/private/Math
+    - MaterialComponents/ShadowLayer
+
+DEPENDENCIES:
+  - MaterialComponents/BottomSheet
+
+SPEC REPOS:
+  trunk:
+    - MaterialComponents
+
+SPEC CHECKSUMS:
+  MaterialComponents: 1a9b2d9d45b1601ae544de85089adc4c464306d4
+
+PODFILE CHECKSUM: 03dfe97db818d3ffbe607abec6c89e84caa670e4
+
+COCOAPODS: 1.10.1
diff --git a/Popcat.xcodeproj/project.pbxproj b/Popcat.xcodeproj/project.pbxproj
index 68f516b..eb20371 100644
--- a/Popcat.xcodeproj/project.pbxproj
+++ b/Popcat.xcodeproj/project.pbxproj
@@ -3,23 +3,27 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5C7AC868AF86CB603C807988 /* Pods_Popcat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A74B011B80FF9519A7D851EF /* Pods_Popcat.framework */; };
+		7D1574E32676ECFD0022C628 /* SettingsSectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D1574E22676ECFD0022C628 /* SettingsSectionView.swift */; };
 		7D2027C325F7296000B33C57 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D2027C225F7296000B33C57 /* Constants.swift */; };
 		7D27273C265B741800CEA32E /* UserDefaultExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D27273B265B741800CEA32E /* UserDefaultExtension.swift */; };
 		7D2C6BA4264D0BDC001D445B /* DeviceAdaptaitonData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D2C6BA3264D0BDC001D445B /* DeviceAdaptaitonData.swift */; };
+		7D2ECD9A2672FEEF00A58B56 /* SettingsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D2ECD992672FEEF00A58B56 /* SettingsSection.swift */; };
+		7D542AF3267AD33000A6F31D /* DeveloperInfoSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D542AF2267AD33000A6F31D /* DeveloperInfoSection.swift */; };
 		7D795CFA25F5FD54006C9469 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D795CF925F5FD54006C9469 /* AppDelegate.swift */; };
 		7D795CFC25F5FD54006C9469 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D795CFB25F5FD54006C9469 /* SceneDelegate.swift */; };
 		7D795CFE25F5FD54006C9469 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D795CFD25F5FD54006C9469 /* MainViewController.swift */; };
 		7D795D0125F5FD54006C9469 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7D795CFF25F5FD54006C9469 /* Main.storyboard */; };
 		7D795D0325F5FD54006C9469 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7D795D0225F5FD54006C9469 /* Assets.xcassets */; };
 		7D795D0625F5FD54006C9469 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7D795D0425F5FD54006C9469 /* LaunchScreen.storyboard */; };
+		7D852C7D2679C41400CA7B40 /* DeveloperInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D852C7C2679C41400CA7B40 /* DeveloperInfoViewController.swift */; };
 		7D87DA4825F751380011ABDA /* TouchEventManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D87DA4725F751380011ABDA /* TouchEventManager.swift */; };
 		7D8E1A3B265788DE00C590B7 /* AssetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D8E1A3A265788DE00C590B7 /* AssetData.swift */; };
-		7D90496726608C6000A061E2 /* SettingsVolumeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D90496526608C6000A061E2 /* SettingsVolumeCell.swift */; };
-		7D90496826608C6000A061E2 /* SettingsVolumeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D90496626608C6000A061E2 /* SettingsVolumeCell.xib */; };
+		7D90496726608C6000A061E2 /* SettingsTableViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D90496526608C6000A061E2 /* SettingsTableViewCells.swift */; };
 		7D94516F26008CD300668BB1 /* CatTowerVeiwController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D94516E26008CD300668BB1 /* CatTowerVeiwController.swift */; };
 		7D94828D265CD05C008BAC01 /* UserDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D94828C265CD05C008BAC01 /* UserDataManager.swift */; };
 		7DB1416D263FC24600205D48 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7DB1416C263FC24600205D48 /* SettingsViewController.swift */; };
@@ -28,9 +32,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		3E81B038F471D58320F6459B /* Pods-Popcat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Popcat.debug.xcconfig"; path = "Target Support Files/Pods-Popcat/Pods-Popcat.debug.xcconfig"; sourceTree = "<group>"; };
+		7D1574E22676ECFD0022C628 /* SettingsSectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSectionView.swift; sourceTree = "<group>"; };
 		7D2027C225F7296000B33C57 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		7D27273B265B741800CEA32E /* UserDefaultExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultExtension.swift; sourceTree = "<group>"; };
 		7D2C6BA3264D0BDC001D445B /* DeviceAdaptaitonData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAdaptaitonData.swift; sourceTree = "<group>"; };
+		7D2ECD992672FEEF00A58B56 /* SettingsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSection.swift; sourceTree = "<group>"; };
+		7D542AF2267AD33000A6F31D /* DeveloperInfoSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperInfoSection.swift; sourceTree = "<group>"; };
 		7D795CF625F5FD53006C9469 /* Popcat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Popcat.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7D795CF925F5FD54006C9469 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7D795CFB25F5FD54006C9469 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -39,15 +47,17 @@
 		7D795D0225F5FD54006C9469 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		7D795D0525F5FD54006C9469 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7D795D0725F5FD54006C9469 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		7D852C7C2679C41400CA7B40 /* DeveloperInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperInfoViewController.swift; sourceTree = "<group>"; };
 		7D87DA4725F751380011ABDA /* TouchEventManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TouchEventManager.swift; sourceTree = "<group>"; };
 		7D8E1A3A265788DE00C590B7 /* AssetData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetData.swift; sourceTree = "<group>"; };
-		7D90496526608C6000A061E2 /* SettingsVolumeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsVolumeCell.swift; sourceTree = "<group>"; };
-		7D90496626608C6000A061E2 /* SettingsVolumeCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SettingsVolumeCell.xib; sourceTree = "<group>"; };
+		7D90496526608C6000A061E2 /* SettingsTableViewCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewCells.swift; sourceTree = "<group>"; };
 		7D94516E26008CD300668BB1 /* CatTowerVeiwController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatTowerVeiwController.swift; sourceTree = "<group>"; };
 		7D94828C265CD05C008BAC01 /* UserDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDataManager.swift; sourceTree = "<group>"; };
 		7DB1416C263FC24600205D48 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
 		7DD780BC263FB92700732C58 /* CatTowerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatTowerCell.swift; sourceTree = "<group>"; };
 		7DD780BD263FB92700732C58 /* CatTowerCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CatTowerCell.xib; sourceTree = "<group>"; };
+		A74B011B80FF9519A7D851EF /* Pods_Popcat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Popcat.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		FDEB7E37ACAED75868C34E4B /* Pods-Popcat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Popcat.release.xcconfig"; path = "Target Support Files/Pods-Popcat/Pods-Popcat.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -55,19 +65,31 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5C7AC868AF86CB603C807988 /* Pods_Popcat.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		5D3B06EFD9101099920601AF /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				A74B011B80FF9519A7D851EF /* Pods_Popcat.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		7D5F5117265E014B00B4C143 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				7D2C6BA3264D0BDC001D445B /* DeviceAdaptaitonData.swift */,
 				7D27273B265B741800CEA32E /* UserDefaultExtension.swift */,
 				7D8E1A3A265788DE00C590B7 /* AssetData.swift */,
 				7D94828C265CD05C008BAC01 /* UserDataManager.swift */,
 				7D87DA4725F751380011ABDA /* TouchEventManager.swift */,
+				7D2ECD992672FEEF00A58B56 /* SettingsSection.swift */,
+				7D542AF2267AD33000A6F31D /* DeveloperInfoSection.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -77,6 +99,8 @@
 			children = (
 				7D795CF825F5FD53006C9469 /* Popcat */,
 				7D795CF725F5FD53006C9469 /* Products */,
+				9936FF80F15BD431966E2C07 /* Pods */,
+				5D3B06EFD9101099920601AF /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -101,7 +125,6 @@
 				7D795D0425F5FD54006C9469 /* LaunchScreen.storyboard */,
 				7D795D0725F5FD54006C9469 /* Info.plist */,
 				7D2027C225F7296000B33C57 /* Constants.swift */,
-				7D2C6BA3264D0BDC001D445B /* DeviceAdaptaitonData.swift */,
 			);
 			path = Popcat;
 			sourceTree = "<group>";
@@ -111,8 +134,8 @@
 			children = (
 				7DD780BC263FB92700732C58 /* CatTowerCell.swift */,
 				7DD780BD263FB92700732C58 /* CatTowerCell.xib */,
-				7D90496526608C6000A061E2 /* SettingsVolumeCell.swift */,
-				7D90496626608C6000A061E2 /* SettingsVolumeCell.xib */,
+				7D90496526608C6000A061E2 /* SettingsTableViewCells.swift */,
+				7D1574E22676ECFD0022C628 /* SettingsSectionView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -121,12 +144,22 @@
 			isa = PBXGroup;
 			children = (
 				7D795CFD25F5FD54006C9469 /* MainViewController.swift */,
-				7DB1416C263FC24600205D48 /* SettingsViewController.swift */,
 				7D94516E26008CD300668BB1 /* CatTowerVeiwController.swift */,
+				7DB1416C263FC24600205D48 /* SettingsViewController.swift */,
+				7D852C7C2679C41400CA7B40 /* DeveloperInfoViewController.swift */,
 			);
 			path = Contoller;
 			sourceTree = "<group>";
 		};
+		9936FF80F15BD431966E2C07 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				3E81B038F471D58320F6459B /* Pods-Popcat.debug.xcconfig */,
+				FDEB7E37ACAED75868C34E4B /* Pods-Popcat.release.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -134,9 +167,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 7D795D0A25F5FD54006C9469 /* Build configuration list for PBXNativeTarget "Popcat" */;
 			buildPhases = (
+				54DF590B26ED162EA3C2DEDC /* [CP] Check Pods Manifest.lock */,
 				7D795CF225F5FD53006C9469 /* Sources */,
 				7D795CF325F5FD53006C9469 /* Frameworks */,
 				7D795CF425F5FD53006C9469 /* Resources */,
+				97755B39526496B0C3A78D88 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -185,7 +220,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				7D795D0625F5FD54006C9469 /* LaunchScreen.storyboard in Resources */,
-				7D90496826608C6000A061E2 /* SettingsVolumeCell.xib in Resources */,
 				7D795D0325F5FD54006C9469 /* Assets.xcassets in Resources */,
 				7DD780BF263FB92700732C58 /* CatTowerCell.xib in Resources */,
 				7D795D0125F5FD54006C9469 /* Main.storyboard in Resources */,
@@ -194,21 +228,67 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		54DF590B26ED162EA3C2DEDC /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Popcat-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		97755B39526496B0C3A78D88 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Popcat/Pods-Popcat-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Popcat/Pods-Popcat-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Popcat/Pods-Popcat-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		7D795CF225F5FD53006C9469 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7D2ECD9A2672FEEF00A58B56 /* SettingsSection.swift in Sources */,
 				7D795CFE25F5FD54006C9469 /* MainViewController.swift in Sources */,
 				7D795CFA25F5FD54006C9469 /* AppDelegate.swift in Sources */,
 				7D8E1A3B265788DE00C590B7 /* AssetData.swift in Sources */,
-				7D90496726608C6000A061E2 /* SettingsVolumeCell.swift in Sources */,
+				7D90496726608C6000A061E2 /* SettingsTableViewCells.swift in Sources */,
 				7D795CFC25F5FD54006C9469 /* SceneDelegate.swift in Sources */,
 				7D87DA4825F751380011ABDA /* TouchEventManager.swift in Sources */,
+				7D852C7D2679C41400CA7B40 /* DeveloperInfoViewController.swift in Sources */,
 				7D27273C265B741800CEA32E /* UserDefaultExtension.swift in Sources */,
 				7D2027C325F7296000B33C57 /* Constants.swift in Sources */,
+				7D1574E32676ECFD0022C628 /* SettingsSectionView.swift in Sources */,
 				7D2C6BA4264D0BDC001D445B /* DeviceAdaptaitonData.swift in Sources */,
 				7D94828D265CD05C008BAC01 /* UserDataManager.swift in Sources */,
+				7D542AF3267AD33000A6F31D /* DeveloperInfoSection.swift in Sources */,
 				7DD780BE263FB92700732C58 /* CatTowerCell.swift in Sources */,
 				7D94516F26008CD300668BB1 /* CatTowerVeiwController.swift in Sources */,
 				7DB1416D263FC24600205D48 /* SettingsViewController.swift in Sources */,
@@ -355,12 +435,13 @@
 		};
 		7D795D0B25F5FD54006C9469 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 3E81B038F471D58320F6459B /* Pods-Popcat.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = ZW6466CHF4;
 				INFOPLIST_FILE = Popcat/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -368,7 +449,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.choiysapple.MyPopcat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -379,12 +460,13 @@
 		};
 		7D795D0C25F5FD54006C9469 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = FDEB7E37ACAED75868C34E4B /* Pods-Popcat.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = ZW6466CHF4;
 				INFOPLIST_FILE = Popcat/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -392,7 +474,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.choiysapple.MyPopcat;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Popcat.xcworkspace/contents.xcworkspacedata b/Popcat.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..8d616ad
--- /dev/null
+++ b/Popcat.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Popcat.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/Popcat.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Popcat.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Popcat.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Popcat/.DS_Store b/Popcat/.DS_Store
index 099de74..773525e 100644
Binary files a/Popcat/.DS_Store and b/Popcat/.DS_Store differ
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/Contents.json b/Popcat/Assets.xcassets/Github_logo.imageset/Contents.json
new file mode 100644
index 0000000..4cffefa
--- /dev/null
+++ b/Popcat/Assets.xcassets/Github_logo.imageset/Contents.json
@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "github-light.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "github-dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "github-light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "github-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "github-light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "github-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/github-dark.png b/Popcat/Assets.xcassets/Github_logo.imageset/github-dark.png
new file mode 100644
index 0000000..5d08fba
Binary files /dev/null and b/Popcat/Assets.xcassets/Github_logo.imageset/github-dark.png differ
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/github-dark@2x.png b/Popcat/Assets.xcassets/Github_logo.imageset/github-dark@2x.png
new file mode 100644
index 0000000..5653fdd
Binary files /dev/null and b/Popcat/Assets.xcassets/Github_logo.imageset/github-dark@2x.png differ
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/github-dark@3x.png b/Popcat/Assets.xcassets/Github_logo.imageset/github-dark@3x.png
new file mode 100644
index 0000000..1287376
Binary files /dev/null and b/Popcat/Assets.xcassets/Github_logo.imageset/github-dark@3x.png differ
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/github-light.png b/Popcat/Assets.xcassets/Github_logo.imageset/github-light.png
new file mode 100644
index 0000000..6afd6eb
Binary files /dev/null and b/Popcat/Assets.xcassets/Github_logo.imageset/github-light.png differ
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/github-light@2x.png b/Popcat/Assets.xcassets/Github_logo.imageset/github-light@2x.png
new file mode 100644
index 0000000..15da18a
Binary files /dev/null and b/Popcat/Assets.xcassets/Github_logo.imageset/github-light@2x.png differ
diff --git a/Popcat/Assets.xcassets/Github_logo.imageset/github-light@3x.png b/Popcat/Assets.xcassets/Github_logo.imageset/github-light@3x.png
new file mode 100644
index 0000000..a668c65
Binary files /dev/null and b/Popcat/Assets.xcassets/Github_logo.imageset/github-light@3x.png differ
diff --git a/Popcat/Assets.xcassets/instagram_logo.imageset/Contents.json b/Popcat/Assets.xcassets/instagram_logo.imageset/Contents.json
new file mode 100644
index 0000000..7368a86
--- /dev/null
+++ b/Popcat/Assets.xcassets/instagram_logo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "instagram.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "instagram@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "instagram@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Popcat/Assets.xcassets/instagram_logo.imageset/instagram.png b/Popcat/Assets.xcassets/instagram_logo.imageset/instagram.png
new file mode 100644
index 0000000..634e798
Binary files /dev/null and b/Popcat/Assets.xcassets/instagram_logo.imageset/instagram.png differ
diff --git a/Popcat/Assets.xcassets/instagram_logo.imageset/instagram@2x.png b/Popcat/Assets.xcassets/instagram_logo.imageset/instagram@2x.png
new file mode 100644
index 0000000..1be4dc1
Binary files /dev/null and b/Popcat/Assets.xcassets/instagram_logo.imageset/instagram@2x.png differ
diff --git a/Popcat/Assets.xcassets/instagram_logo.imageset/instagram@3x.png b/Popcat/Assets.xcassets/instagram_logo.imageset/instagram@3x.png
new file mode 100644
index 0000000..2299b3b
Binary files /dev/null and b/Popcat/Assets.xcassets/instagram_logo.imageset/instagram@3x.png differ
diff --git a/Popcat/Assets.xcassets/testflight_logo.imageset/Contents.json b/Popcat/Assets.xcassets/testflight_logo.imageset/Contents.json
new file mode 100644
index 0000000..90b1256
--- /dev/null
+++ b/Popcat/Assets.xcassets/testflight_logo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "testflight.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "testflight@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "testflight@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Popcat/Assets.xcassets/testflight_logo.imageset/testflight.png b/Popcat/Assets.xcassets/testflight_logo.imageset/testflight.png
new file mode 100644
index 0000000..d867917
Binary files /dev/null and b/Popcat/Assets.xcassets/testflight_logo.imageset/testflight.png differ
diff --git a/Popcat/Assets.xcassets/testflight_logo.imageset/testflight@2x.png b/Popcat/Assets.xcassets/testflight_logo.imageset/testflight@2x.png
new file mode 100644
index 0000000..5569a46
Binary files /dev/null and b/Popcat/Assets.xcassets/testflight_logo.imageset/testflight@2x.png differ
diff --git a/Popcat/Assets.xcassets/testflight_logo.imageset/testflight@3x.png b/Popcat/Assets.xcassets/testflight_logo.imageset/testflight@3x.png
new file mode 100644
index 0000000..0c69333
Binary files /dev/null and b/Popcat/Assets.xcassets/testflight_logo.imageset/testflight@3x.png differ
diff --git a/Popcat/Base.lproj/Main.storyboard b/Popcat/Base.lproj/Main.storyboard
index 8e2b4c8..6606dde 100644
--- a/Popcat/Base.lproj/Main.storyboard
+++ b/Popcat/Base.lproj/Main.storyboard
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_0" orientation="portrait" appearance="light"/>
+    <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
@@ -16,17 +16,17 @@
             <objects>
                 <viewController storyboardIdentifier="MainViewController" id="BYZ-38-t0r" customClass="MainViewController" customModule="Popcat" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" image="popcat_closed" translatesAutoresizingMaskIntoConstraints="NO" id="Dr2-Yn-Uf5">
-                                <rect key="frame" x="80" y="312" width="230" height="230"/>
+                                <rect key="frame" x="80" y="326" width="254" height="254"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Dr2-Yn-Uf5" secondAttribute="height" id="J9s-ah-3NE"/>
                                 </constraints>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="21" translatesAutoresizingMaskIntoConstraints="NO" id="ayo-go-8WJ">
-                                <rect key="frame" x="0.0" y="215.66666666666666" width="390" height="56.333333333333343"/>
+                                <rect key="frame" x="0.0" y="229.66666666666666" width="414" height="56.333333333333343"/>
                                 <attributedString key="attributedText">
                                     <fragment content="0">
                                         <attributes>
@@ -44,7 +44,7 @@
                                 </userDefinedRuntimeAttributes>
                             </label>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yzH-iR-VZs">
-                                <rect key="frame" x="20" y="610" width="350" height="180"/>
+                                <rect key="frame" x="20" y="662" width="374" height="180"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="arrow.up" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="U5Z-nP-4Np">
                                         <rect key="frame" x="20" y="21.333333333333371" width="77" height="146"/>
@@ -145,11 +145,11 @@
             <objects>
                 <viewController id="nrZ-NO-NY9" customClass="CatTowerVeiwController" customModule="Popcat" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="W5O-AR-9wn">
-                        <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N5W-R4-Pqr">
-                                <rect key="frame" x="20" y="108.00000000000001" width="350" height="42.666666666666671"/>
+                                <rect key="frame" x="20" y="108.00000000000001" width="374" height="42.666666666666671"/>
                                 <attributedString key="attributedText">
                                     <fragment content="Cat Tower ">
                                         <attributes>
@@ -172,10 +172,10 @@
                                 </userDefinedRuntimeAttributes>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3t7-hl-btQ" userLabel="SwitchBG">
-                                <rect key="frame" x="0.0" y="170.66666666666666" width="390" height="51"/>
+                                <rect key="frame" x="0.0" y="170.66666666666666" width="414" height="51"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hdz-8s-Ghh">
-                                        <rect key="frame" x="20" y="10" width="350" height="31"/>
+                                        <rect key="frame" x="20" y="10" width="374" height="31"/>
                                         <attributedString key="attributedText">
                                             <fragment content="Show Pop count">
                                                 <attributes>
@@ -191,7 +191,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="yui-If-X1D">
-                                        <rect key="frame" x="321" y="10" width="51" height="31"/>
+                                        <rect key="frame" x="345" y="10" width="51" height="31"/>
                                         <color key="tintColor" red="0.45375967029999997" green="0.28686437009999999" blue="0.26273727419999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <color key="onTintColor" name="AccentColor"/>
                                     </switch>
@@ -209,11 +209,11 @@
                                 </constraints>
                             </view>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xVy-pc-sUF" userLabel="ButtonBG">
-                                <rect key="frame" x="0.0" y="706.33333333333337" width="390" height="137.66666666666663"/>
+                                <rect key="frame" x="0.0" y="758.33333333333337" width="414" height="137.66666666666663"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9gh-ii-5Ki">
-                                <rect key="frame" x="20" y="726.33333333333337" width="350" height="63.666666666666629"/>
+                                <rect key="frame" x="20" y="778.33333333333337" width="374" height="63.666666666666629"/>
                                 <color key="backgroundColor" name="AccentColor"/>
                                 <state key="normal">
                                     <attributedString key="attributedTitle">
@@ -234,8 +234,8 @@
                                     <action selector="doneButtonClicked:" destination="nrZ-NO-NY9" eventType="touchUpInside" id="QLQ-e1-8eg"/>
                                 </connections>
                             </button>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1ph-jm-b2a">
-                                <rect key="frame" x="327.66666666666669" y="108.00000000000001" width="42.333333333333314" height="42.666666666666671"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1ph-jm-b2a">
+                                <rect key="frame" x="351.66666666666669" y="108.00000000000001" width="42.333333333333314" height="42.666666666666671"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="1ph-jm-b2a" secondAttribute="height" id="mUL-C3-ecY"/>
                                 </constraints>
@@ -248,7 +248,7 @@
                                 </connections>
                             </button>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Cqj-A6-7E6">
-                                <rect key="frame" x="0.0" y="231.66666666666666" width="390" height="464.66666666666674"/>
+                                <rect key="frame" x="0.0" y="231.66666666666669" width="414" height="516.66666666666652"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="iSB-dH-Bjf">
                                     <size key="itemSize" width="128" height="128"/>
@@ -314,17 +314,17 @@
             <objects>
                 <viewController modalPresentationStyle="fullScreen" id="cuW-wY-uA7" customClass="SettingsViewController" customModule="Popcat" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="l07-BM-Mza">
-                        <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleAspectFit" verticalHuggingPriority="200" verticalCompressionResistancePriority="700" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A68-LN-OFK">
-                                <rect key="frame" x="20" y="116.33333333333331" width="38" height="38"/>
+                                <rect key="frame" x="20" y="120.66666666666669" width="30" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="A68-LN-OFK" secondAttribute="height" id="2NC-h6-aub"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <color key="tintColor" name="Color"/>
-                                <state key="normal" title="Button">
+                                <state key="normal">
                                     <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="30"/>
                                 </state>
                                 <connections>
@@ -332,7 +332,7 @@
                                 </connections>
                             </button>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow.backward" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="ZBe-rn-cBv">
-                                <rect key="frame" x="20" y="120.66666666666667" width="38" height="29.666666666666671"/>
+                                <rect key="frame" x="20" y="125.00000000000001" width="30" height="21.666666666666671"/>
                                 <color key="tintColor" name="Color"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="ZBe-rn-cBv" secondAttribute="height" id="QLE-a9-kdt"/>
@@ -340,7 +340,7 @@
                                 <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="small" weight="regular"/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" verticalCompressionResistancePriority="751" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xj7-i8-fqT">
-                                <rect key="frame" x="68" y="108.00000000000001" width="302" height="54.666666666666671"/>
+                                <rect key="frame" x="60" y="108" width="334" height="55"/>
                                 <attributedString key="attributedText">
                                     <fragment content="Settings ">
                                         <attributes>
@@ -358,33 +358,26 @@
                                 </attributedString>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sQ5-3b-nyv">
-                                <rect key="frame" x="-20" y="152.66666666666669" width="430" height="711.33333333333326"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <subviews>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="sqX-HE-jA8">
-                                        <rect key="frame" x="20" y="20" width="390" height="671.33333333333326"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                        <prototypes>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingsCell" id="iqF-wV-5ow">
-                                                <rect key="frame" x="0.0" y="24.333333969116211" width="390" height="43.666667938232422"/>
-                                                <autoresizingMask key="autoresizingMask"/>
-                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="SettingsCell" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="iqF-wV-5ow" id="EbK-pM-AGJ">
-                                                    <rect key="frame" x="0.0" y="0.0" width="390" height="43.666667938232422"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </tableViewCellContentView>
-                                            </tableViewCell>
-                                        </prototypes>
-                                        <connections>
-                                            <outlet property="dataSource" destination="cuW-wY-uA7" id="hxe-hz-laM"/>
-                                            <outlet property="delegate" destination="cuW-wY-uA7" id="ste-vq-QOL"/>
-                                        </connections>
-                                    </tableView>
-                                </subviews>
-                                <viewLayoutGuide key="contentLayoutGuide" id="1IQ-H3-hrd"/>
-                                <viewLayoutGuide key="frameLayoutGuide" id="3Kt-Ui-eRw"/>
-                            </scrollView>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="sqX-HE-jA8">
+                                <rect key="frame" x="0.0" y="183" width="414" height="713"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <color key="separatorColor" name="BgColor"/>
+                                <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingsCell" id="iqF-wV-5ow">
+                                        <rect key="frame" x="20" y="49" width="374" height="43.666667938232422"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="SettingsCell" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="iqF-wV-5ow" id="EbK-pM-AGJ">
+                                            <rect key="frame" x="0.0" y="0.0" width="374" height="43.666667938232422"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="cuW-wY-uA7" id="hxe-hz-laM"/>
+                                    <outlet property="delegate" destination="cuW-wY-uA7" id="ste-vq-QOL"/>
+                                </connections>
+                            </tableView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="680-h0-gg3"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -392,10 +385,14 @@
                             <constraint firstItem="Xj7-i8-fqT" firstAttribute="centerY" secondItem="A68-LN-OFK" secondAttribute="centerY" id="0Tk-Ol-fwJ"/>
                             <constraint firstItem="ZBe-rn-cBv" firstAttribute="centerY" secondItem="A68-LN-OFK" secondAttribute="centerY" id="0dT-lR-rRn"/>
                             <constraint firstItem="ZBe-rn-cBv" firstAttribute="height" secondItem="A68-LN-OFK" secondAttribute="height" id="3fX-ux-urF"/>
+                            <constraint firstAttribute="bottom" secondItem="sqX-HE-jA8" secondAttribute="bottom" id="Ebv-uP-FvG"/>
+                            <constraint firstAttribute="trailing" secondItem="sqX-HE-jA8" secondAttribute="trailing" id="Hvg-QX-Kca"/>
                             <constraint firstItem="Xj7-i8-fqT" firstAttribute="top" secondItem="680-h0-gg3" secondAttribute="top" constant="20" id="KDF-Uo-WCg"/>
                             <constraint firstItem="Xj7-i8-fqT" firstAttribute="leading" secondItem="A68-LN-OFK" secondAttribute="trailing" constant="10" id="TU9-RP-pef"/>
                             <constraint firstItem="680-h0-gg3" firstAttribute="trailing" secondItem="Xj7-i8-fqT" secondAttribute="trailing" constant="20" id="mGy-tx-Jjb"/>
                             <constraint firstItem="ZBe-rn-cBv" firstAttribute="centerX" secondItem="A68-LN-OFK" secondAttribute="centerX" id="siq-kH-UbP"/>
+                            <constraint firstItem="sqX-HE-jA8" firstAttribute="top" secondItem="Xj7-i8-fqT" secondAttribute="bottom" constant="20" id="veL-FH-KvF"/>
+                            <constraint firstItem="sqX-HE-jA8" firstAttribute="leading" secondItem="l07-BM-Mza" secondAttribute="leading" id="xch-Yo-7PI"/>
                             <constraint firstItem="A68-LN-OFK" firstAttribute="leading" secondItem="680-h0-gg3" secondAttribute="leading" constant="20" id="ye5-9M-mhQ"/>
                         </constraints>
                     </view>
@@ -408,13 +405,103 @@
             </objects>
             <point key="canvasLocation" x="2649.2307692307691" y="96.682464454976298"/>
         </scene>
+        <!--Developer Info View Controller-->
+        <scene sceneID="gWs-7x-5rk">
+            <objects>
+                <viewController storyboardIdentifier="DeveloperView" id="0wx-Dx-kVH" customClass="DeveloperInfoViewController" customModule="Popcat" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="DNj-ei-Lon">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="op5-z6-Jad">
+                                <rect key="frame" x="104" y="49" width="206" height="49.666666666666657"/>
+                                <attributedString key="attributedText">
+                                    <fragment content="ChoiysApple">
+                                        <attributes>
+                                            <font key="NSFont" size="36" name="Avenir-Book"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S51-wB-07e">
+                                <rect key="frame" x="122.66666666666669" y="103.66666666666667" width="169" height="19"/>
+                                <attributedString key="attributedText">
+                                    <fragment content="Visit GitHub page for more">
+                                        <attributes>
+                                            <font key="NSFont" size="14" name="Avenir-Book"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="r6g-Nm-PQh">
+                                <rect key="frame" x="25" y="132.66666666666669" width="364" height="679.33333333333326"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="developerCell" textLabel="YIE-Jt-RtW" detailTextLabel="70z-Bm-aDJ" style="IBUITableViewCellStyleSubtitle" id="t0O-Pg-cbm">
+                                        <rect key="frame" x="0.0" y="49" width="364" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="t0O-Pg-cbm" id="WSB-Eh-fBn">
+                                            <rect key="frame" x="0.0" y="0.0" width="364" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YIE-Jt-RtW">
+                                                    <rect key="frame" x="20" y="7.0000000000000009" width="25" height="14.333333333333334"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="0.0"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="70z-Bm-aDJ">
+                                                    <rect key="frame" x="19.999999999999996" y="23.333333333333336" width="40.666666666666664" height="13.333333333333334"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="0wx-Dx-kVH" id="F5j-HS-Jg8"/>
+                                    <outlet property="delegate" destination="0wx-Dx-kVH" id="9bM-7J-fvJ"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="ZKz-kT-syM"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="ZKz-kT-syM" firstAttribute="trailing" secondItem="r6g-Nm-PQh" secondAttribute="trailing" constant="25" id="3OY-Ks-eUS"/>
+                            <constraint firstItem="op5-z6-Jad" firstAttribute="top" secondItem="ZKz-kT-syM" secondAttribute="top" constant="5" id="5I3-cu-eA9"/>
+                            <constraint firstItem="ZKz-kT-syM" firstAttribute="bottom" secondItem="r6g-Nm-PQh" secondAttribute="bottom" constant="50" id="C1n-0L-y1z"/>
+                            <constraint firstItem="r6g-Nm-PQh" firstAttribute="leading" secondItem="ZKz-kT-syM" secondAttribute="leading" constant="25" id="EBZ-yd-qwo"/>
+                            <constraint firstItem="op5-z6-Jad" firstAttribute="centerX" secondItem="DNj-ei-Lon" secondAttribute="centerX" id="V7S-yb-xju"/>
+                            <constraint firstItem="r6g-Nm-PQh" firstAttribute="top" secondItem="S51-wB-07e" secondAttribute="bottom" constant="10" id="aaJ-13-gHs"/>
+                            <constraint firstItem="S51-wB-07e" firstAttribute="top" secondItem="op5-z6-Jad" secondAttribute="bottom" constant="5" id="gad-hz-xv8"/>
+                            <constraint firstItem="S51-wB-07e" firstAttribute="centerX" secondItem="DNj-ei-Lon" secondAttribute="centerX" id="zLx-hy-p8T"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="descriptionLabel" destination="S51-wB-07e" id="LSa-0I-3vy"/>
+                        <outlet property="nameLabel" destination="op5-z6-Jad" id="dRt-qY-83S"/>
+                        <outlet property="tableView" destination="r6g-Nm-PQh" id="PFz-UL-Wpm"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="GOa-Cx-b3o" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3550.7692307692305" y="96.682464454976298"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="aab-R3-I41">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="2ZR-lF-THp" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="s6e-pV-jjL">
-                        <rect key="frame" x="0.0" y="44" width="390" height="44"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
diff --git a/Popcat/Constants.swift b/Popcat/Constants.swift
index 826c2d3..324f165 100644
--- a/Popcat/Constants.swift
+++ b/Popcat/Constants.swift
@@ -11,6 +11,8 @@ struct Identifier {
     static let settingSegue = "mainToSettings"
     static let mainViewController = "MainViewController"
     static let SettingsTableViewCell = "SettingsCell"
+    static let DeveloperPageViewController = "DeveloperView"
+    static let DeveloperPageCell = "developerCell"
 }
 
 struct UserDataKey {
@@ -23,8 +25,23 @@ struct UserDataKey {
     static let currentCatName = "current_cat"
     static let touchDownImage = "touchdown_image"
     static let touchUpImage = "touchup_image"
-    static let popSound = "pop_sound"
     static let mainImage = "main_image"
+
+    static let popSound = "pop_sound"
+    static let popVolume = "pop_volume"
     
     static let background = "background"
 }
+
+struct DeveloperInfo {
+    static let name = "Daegun Choi"
+    static let description = "Visit GitHub for more"
+}
+
+var currentVersion: String {
+    guard let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else { return "unidentified" }
+    let currentVersion: String = "\(version)"
+    
+    return currentVersion
+}
+
diff --git a/Popcat/Contoller/DeveloperInfoViewController.swift b/Popcat/Contoller/DeveloperInfoViewController.swift
new file mode 100644
index 0000000..5d63e51
--- /dev/null
+++ b/Popcat/Contoller/DeveloperInfoViewController.swift
@@ -0,0 +1,80 @@
+//
+//  DeveloperInfoViewController.swift
+//  Popcat
+//
+//  Created by Daegeon Choi on 2021/06/16.
+//
+
+import UIKit
+
+class DeveloperInfoViewController: UIViewController {
+
+    @IBOutlet weak var nameLabel: UILabel!
+    @IBOutlet weak var descriptionLabel: UILabel!
+    @IBOutlet weak var tableView: UITableView!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        nameLabel.text = DeveloperInfo.name
+        descriptionLabel.text = DeveloperInfo.description
+        
+        tableView.isScrollEnabled = false
+        // Do any additional setup after loading the view.
+    }
+    
+}
+
+extension DeveloperInfoViewController: UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return DeveloperInfoSection.allCases.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = UITableViewCell(style: UITableViewCell.CellStyle.subtitle, reuseIdentifier: Identifier.DeveloperPageCell)
+        guard let section = DeveloperInfoSection(rawValue: indexPath.section) else { return UITableViewCell() }
+        
+        cell.textLabel?.text = section.title
+        cell.detailTextLabel?.text = section.subtitle
+        cell.imageView?.image = UIImage(named: section.imageSourceName)
+        cell.imageView?.layer.cornerRadius = 13
+        cell.imageView?.layer.masksToBounds = true
+        
+        return cell
+    }
+    
+}
+
+extension DeveloperInfoViewController: UITableViewDelegate {
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 50
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        guard let section = DeveloperInfoSection(rawValue: indexPath.section) else { return }
+        
+        if let url = URL(string: section.pageURL) {
+            UIApplication.shared.open(url)
+        }
+        
+        tableView.cellForRow(at: indexPath)?.isSelected = false
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.0
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        if section != DeveloperInfoSection.allCases.count - 1 {
+            return 10
+        }else{
+            return 0
+        }
+
+    }
+}
diff --git a/Popcat/Contoller/MainViewController.swift b/Popcat/Contoller/MainViewController.swift
index 9e6f7b3..92e0736 100644
--- a/Popcat/Contoller/MainViewController.swift
+++ b/Popcat/Contoller/MainViewController.swift
@@ -20,7 +20,7 @@ class MainViewController: UIViewController {
     private var touchUpImageSource: UIImage?
     
     //MARK: Helper Classes
-    private var touchEvent = TouchEventManager()
+    private var touchEvent = TouchEventManager(source: defaultAssetData.audioSourceName, volume: 1.0)
     private let dataManager = UserDataManager()
     
     // Timer related
@@ -39,15 +39,15 @@ class MainViewController: UIViewController {
             dataManager.setIsInitialLaunch(isFirst: true)
             
             dataManager.setCatData(catData: defaultAssetData)
+            dataManager.setPopSoundVolume(volume: 1.0)
         }
-        
-        touchEvent.delegate = self
     }
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         updateViewSettings()
+        touchEvent.delegate = self
     }
 
 }
@@ -119,7 +119,9 @@ extension MainViewController {
         touchDownImageSource = UIImage(named: catData.openedImageName)
         popcatImage.image = touchUpImageSource
         
-        touchEvent.setAudioSource(audioSource: catData.audioSourceName)
+        let popSoundVolume = dataManager.getPopSoundVolume()
+        
+        touchEvent = TouchEventManager(source: catData.audioSourceName, volume: popSoundVolume)
         timer.invalidate()
     }
     
diff --git a/Popcat/Contoller/SettingsViewController.swift b/Popcat/Contoller/SettingsViewController.swift
index f4deec9..6ea228c 100644
--- a/Popcat/Contoller/SettingsViewController.swift
+++ b/Popcat/Contoller/SettingsViewController.swift
@@ -6,19 +6,20 @@
 //
 
 import UIKit
+import MaterialComponents.MaterialBottomSheet
 
 class SettingsViewController: UIViewController {
     
     @IBOutlet weak var tableView: UITableView!
     
     private let cellId = Identifier.SettingsTableViewCell
-
+    
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        tableView.register(SettingsVolumeCell.self, forCellReuseIdentifier: cellId)
+
         tableView.tableFooterView = UIView()
+        tableView.allowsSelection = true
         
         navigationController?.interactivePopGestureRecognizer?.delegate = nil
     }
@@ -30,33 +31,96 @@ class SettingsViewController: UIViewController {
 
 }
 
+//MARK:- UITableViewDataSource
 extension SettingsViewController: UITableViewDataSource {
     
     // Section
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
+        return SettingsSection.allCases.count
     }
     
-    func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        return "Volume"
+    // Cell
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        guard let section = SettingsSection(rawValue: section) else {
+            return 0
+        }
+        
+        switch section {
+        case .volume: return VolumeOption.allCases.count
+        case .About: return AboutOption.allCases.count
+        }
     }
     
-    func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
-        return "  "
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        guard let section = SettingsSection(rawValue: indexPath.section) else { return UITableViewCell() }
+        
+        switch section {
+        case .volume:
+            return VolumeOption.volume.cell
+        case .About:
+            return AboutOption(rawValue: indexPath.row)?.cell ?? UITableViewCell()
+        }
+
     }
     
+}
+
+//MARK: TableView Header/Footer options
+extension SettingsViewController: UITableViewDelegate {
     
-    // Cell
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 1
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        guard let description = SettingsSection(rawValue: section)?.headerDescription else {
+            return tableViewSectionHeaderView(description: "")
+        }
+        
+        return tableViewSectionHeaderView(description: description)
     }
     
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: self.cellId, for: indexPath) as! SettingsVolumeCell
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         
-        return cell
+        return 50
     }
     
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        guard let description = SettingsSection(rawValue: section)?.footerDescription else {
+            return tableViewSectionHeaderView(description: "")
+        }
+        
+        return tableViewSectionFooterView(description: description)
+
+    }
     
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        
+        return 70
+    }
+}
+
+//MARK: Interaction
+extension SettingsViewController {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        guard let section = SettingsSection(rawValue: indexPath.section) else { return }
+        
+        if section == .About {
+            if AboutOption.init(rawValue: indexPath.row) == .developer {
+                openBottomSheet()
+                tableView.cellForRow(at: indexPath)?.isSelected = false
+            }
+        }
+    }
     
+    // Open bottom sheet
+    private func openBottomSheet() {
+        let viewController = storyboard?.instantiateViewController(withIdentifier: "DeveloperView") as! DeveloperInfoViewController
+        let bottomSheet: MDCBottomSheetController = MDCBottomSheetController(contentViewController: viewController)
+        bottomSheet.preferredContentSize = CGSize(width: self.view.frame.size.width, height: 360)
+        print(self.view.frame.size.height / 2.5)
+        present(bottomSheet, animated: true, completion: nil)
+    }
 }
+
+
diff --git a/Popcat/Model/DeveloperInfoSection.swift b/Popcat/Model/DeveloperInfoSection.swift
new file mode 100644
index 0000000..91c1565
--- /dev/null
+++ b/Popcat/Model/DeveloperInfoSection.swift
@@ -0,0 +1,40 @@
+//
+//  DeveloperInfoSection.swift
+//  Popcat
+//
+//  Created by Daegeon Choi on 2021/06/17.
+//
+
+import Foundation
+
+enum DeveloperInfoSection: Int, CaseIterable {
+    case github, testflight
+    
+    var title: String {
+        switch self {
+        case .github: return "GitHub"
+        case .testflight: return "TestFlight"
+        }
+    }
+    
+    var subtitle: String {
+        switch self {
+        case .github: return "Visit GitHub page for more"
+        case .testflight: return "Try next version in advanced"
+        }
+    }
+    
+    var imageSourceName: String {
+        switch self {
+        case .github: return "Github_logo"
+        case .testflight: return "testflight_logo"
+        }
+    }
+    
+    var pageURL: String {
+        switch self {
+        case .github: return "https://github.com/ChoiysApple/My-Little-Popcat"
+        case .testflight: return "https://testflight.apple.com/join/HJakiRWd"
+        }
+    }
+}
diff --git a/Popcat/DeviceAdaptaitonData.swift b/Popcat/Model/DeviceAdaptaitonData.swift
similarity index 100%
rename from Popcat/DeviceAdaptaitonData.swift
rename to Popcat/Model/DeviceAdaptaitonData.swift
diff --git a/Popcat/Model/SettingsSection.swift b/Popcat/Model/SettingsSection.swift
new file mode 100644
index 0000000..e3a889e
--- /dev/null
+++ b/Popcat/Model/SettingsSection.swift
@@ -0,0 +1,70 @@
+//
+//  SettingsSection.swift
+//  Popcat
+//
+//  Created by Daegeon Choi on 2021/06/11.
+//
+
+import Foundation
+import UIKit
+
+enum SettingsSection: Int, CaseIterable {
+    case volume, About
+    
+    var headerDescription: String {
+        switch self {
+        case .volume: return "Volume"
+        case .About: return "About"
+        }
+    }
+    
+    var footerDescription: String {
+        switch self {
+        case .volume: return "Set pop sound Volume"
+        case .About: return "Show Developer information"
+        }
+    }
+}
+
+enum VolumeOption: Int, CaseIterable {
+    case volume
+    
+    var description: String {
+        switch self {
+        case .volume: return "Volume"
+        }
+    }
+    
+    var cell: UITableViewCell {
+        switch self {
+        case .volume: return SettingsVolumeCell()
+        }
+    }
+}
+
+enum AboutOption: Int, CaseIterable {
+    
+    case version, developer
+    
+    var description: String {
+        switch self {
+        case .version: return "Version"
+        case .developer: return "Developer Info"
+        }
+    }
+    
+    var cell: UITableViewCell {
+        switch self {
+        case .version:
+            let cell = SettingsInfoOnlyCell()
+            cell.textLabel?.text = self.description
+            cell.subLabel.text = currentVersion
+            return cell
+        case .developer:
+            let cell = SettingsDiscolsureCell()
+            cell.textLabel?.text = self.description
+            return cell
+        }
+    }
+}
+
diff --git a/Popcat/Model/TouchEventManager.swift b/Popcat/Model/TouchEventManager.swift
index 0051915..f7d230c 100644
--- a/Popcat/Model/TouchEventManager.swift
+++ b/Popcat/Model/TouchEventManager.swift
@@ -18,18 +18,22 @@ class TouchEventManager {
     
     var delegate: touchEventDelegate?
     private var popSoundEffect: AVAudioPlayer?
-    private var popSoundSource: String?
     
-    func setAudioSource(audioSource: String) {
-        popSoundSource = audioSource
+    var popSoundSource: String?
+    var popSoundVolume: Float
+    
+    init(source: String, volume: Float) {
+        self.popSoundSource = source
+        self.popSoundVolume = volume
     }
     
+    
     func touchDownAction() {
-        
         // play sound
         let popSound = NSDataAsset(name: popSoundSource ?? defaultAssetData.audioSourceName)?.data
         do {
             popSoundEffect = try AVAudioPlayer(data: popSound!)
+            popSoundEffect?.setVolume(popSoundVolume, fadeDuration: 0)
             popSoundEffect?.play()
             
         } catch {
diff --git a/Popcat/Model/UserDataManager.swift b/Popcat/Model/UserDataManager.swift
index 5418609..7626d86 100644
--- a/Popcat/Model/UserDataManager.swift
+++ b/Popcat/Model/UserDataManager.swift
@@ -33,6 +33,10 @@ class UserDataManager {
         userDefaults.set(isFirst, forKey: UserDataKey.isNotFirstLaunch)
     }
     
+    func setPopSoundVolume(volume: Float){
+        userDefaults.set(volume, forKey: UserDataKey.popVolume)
+    }
+    
     
     //MARK:- Getters
     func getCatData() -> AssetData {
@@ -59,4 +63,7 @@ class UserDataManager {
         return userDefaults.bool(forKey: UserDataKey.isNotFirstLaunch)
     }
     
+    func getPopSoundVolume() -> Float{
+        return userDefaults.float(forKey: UserDataKey.popVolume)
+    }
 }
diff --git a/Popcat/View/SettingsSectionView.swift b/Popcat/View/SettingsSectionView.swift
new file mode 100644
index 0000000..8b5919b
--- /dev/null
+++ b/Popcat/View/SettingsSectionView.swift
@@ -0,0 +1,47 @@
+//
+//  SettingsSectionView.swift
+//  Popcat
+//
+//  Created by Daegeon Choi on 2021/06/14.
+//
+
+import Foundation
+import UIKit
+
+//MARK: - header view
+public func tableViewSectionHeaderView(description: String) -> UIView {
+    let descriptionLabel = UILabel()
+    descriptionLabel.font = UIFont(name: "AvenirNext-medium", size: 28)
+    descriptionLabel.text = description
+    descriptionLabel.textAlignment = .left
+    descriptionLabel.translatesAutoresizingMaskIntoConstraints = false
+
+    let contentView = UIView()
+    
+    contentView.addSubview(descriptionLabel)
+    descriptionLabel.centerYAnchor.constraint(equalTo: contentView.centerYAnchor).isActive = true
+    descriptionLabel.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: -15).isActive = true
+    descriptionLabel.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant: 15).isActive = true
+    descriptionLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 5).isActive = true
+    descriptionLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -5).isActive = true
+    
+    return contentView
+}
+
+//MARK: footer view
+public func tableViewSectionFooterView(description: String) -> UIView {
+    let descriptionLabel = UILabel()
+    descriptionLabel.font = UIFont(name: "AvenirNext-regular", size: 15.0)
+    descriptionLabel.textColor = .systemGray
+    descriptionLabel.text = description
+    descriptionLabel.textAlignment = .left
+    descriptionLabel.translatesAutoresizingMaskIntoConstraints = false
+
+    let contentView = UIView()
+    contentView.addSubview(descriptionLabel)
+    descriptionLabel.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: -15).isActive = true
+    descriptionLabel.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant: 15).isActive = true
+    descriptionLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 5).isActive = true
+    
+    return contentView
+}
diff --git a/Popcat/View/SettingsTableViewCells.swift b/Popcat/View/SettingsTableViewCells.swift
new file mode 100644
index 0000000..b021ce5
--- /dev/null
+++ b/Popcat/View/SettingsTableViewCells.swift
@@ -0,0 +1,97 @@
+//
+//  SettingsVolumeCell.swift
+//  Popcat
+//
+//  Created by Daegeon Choi on 2021/05/28.
+//
+
+import UIKit
+
+//MARK: Volume Cell
+class SettingsVolumeCell: UITableViewCell {
+
+    lazy var volumeSlider: UISlider = {
+        let volumeSlider = UISlider()
+        volumeSlider.minimumValueImage = UIImage(systemName: "speaker.fill")
+        volumeSlider.maximumValueImage = UIImage(systemName: "speaker.wave.3.fill")
+        volumeSlider.translatesAutoresizingMaskIntoConstraints = false
+        
+        let currentVolume = UserDataManager().getPopSoundVolume()
+        volumeSlider.value = currentVolume
+        
+        volumeSlider.addTarget(self, action: #selector(sliderActionHandler), for: .valueChanged)
+        
+        return volumeSlider
+    }()
+    
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        
+        self.contentView.isUserInteractionEnabled = true
+        self.contentView.backgroundColor = UIColor.systemGray6
+        addSubview(volumeSlider)
+        volumeSlider.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
+        volumeSlider.rightAnchor.constraint(equalTo: rightAnchor, constant: -20).isActive = true
+        volumeSlider.leftAnchor.constraint(equalTo: leftAnchor, constant: 20).isActive = true
+
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func sliderActionHandler(sender: UISlider) {
+        let volume = sender.value
+        UserDataManager().setPopSoundVolume(volume: volume)
+    }
+    
+}
+
+//MARK: Info Cell
+class SettingsInfoOnlyCell: UITableViewCell {
+    
+    let subLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont(name: "AvenirNext", size: UIFont.labelFontSize)
+        label.textColor = .systemGray
+        label.translatesAutoresizingMaskIntoConstraints = false
+        return label
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
+        
+        self.textLabel?.font = UIFont(name: "AvenirNext", size: UIFont.labelFontSize)
+        self.textLabel?.textColor = .systemGray
+        self.contentView.backgroundColor = UIColor.systemGray6
+        
+        addSubview(subLabel)
+        subLabel.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
+        subLabel.rightAnchor.constraint(equalTo: rightAnchor, constant: -20).isActive = true
+    }
+    
+    
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+//MARK: Disclosure cell
+class SettingsDiscolsureCell: UITableViewCell {
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: .subtitle, reuseIdentifier: reuseIdentifier)
+        
+        self.backgroundColor = .systemGray6
+        self.textLabel?.font = UIFont(name: "AvenirNext", size: UIFont.labelFontSize)
+        
+        self.accessoryType = .disclosureIndicator
+        self.accessoryView?.backgroundColor = .systemGray6
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
diff --git a/Popcat/View/SettingsVolumeCell.swift b/Popcat/View/SettingsVolumeCell.swift
deleted file mode 100644
index 2ce0d7a..0000000
--- a/Popcat/View/SettingsVolumeCell.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  SettingsVolumeCell.swift
-//  Popcat
-//
-//  Created by Daegeon Choi on 2021/05/28.
-//
-
-import UIKit
-
-class SettingsVolumeCell: UITableViewCell {
-
-    @IBOutlet weak var volumeSlider: UISlider!
-    
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        
-        // Initialization code
-    }
-
-    override func setSelected(_ selected: Bool, animated: Bool) {
-        super.setSelected(selected, animated: animated)
-
-        // Configure the view for the selected state
-    }
-    
-}
diff --git a/Popcat/View/SettingsVolumeCell.xib b/Popcat/View/SettingsVolumeCell.xib
index 89be268..d7e30c9 100644
--- a/Popcat/View/SettingsVolumeCell.xib
+++ b/Popcat/View/SettingsVolumeCell.xib
@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SettingsCell" id="KGk-i7-Jjw" customClass="SettingsVolumeCell" customModule="Popcat" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+            <rect key="frame" x="0.0" y="0.0" width="298" height="44"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                <rect key="frame" x="0.0" y="0.0" width="298" height="44"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <slider opaque="NO" contentMode="scaleToFill" restorationIdentifier="ㄴ" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" minimumValueImage="volume.1.fill" catalog="system" maximumValueImage="volume.3.fill" translatesAutoresizingMaskIntoConstraints="NO" id="zvL-P6-IXc">
-                        <rect key="frame" x="18" y="5.5" width="284" height="34"/>
+                        <rect key="frame" x="18" y="5.5" width="262" height="34"/>
                         <color key="tintColor" name="AccentColor"/>
                     </slider>
                 </subviews>
@@ -33,7 +33,7 @@
             <connections>
                 <outlet property="volumeSlider" destination="zvL-P6-IXc" id="c5D-0G-NG4"/>
             </connections>
-            <point key="canvasLocation" x="43" y="80"/>
+            <point key="canvasLocation" x="26.086956521739133" y="79.6875"/>
         </tableViewCell>
     </objects>
     <resources>