diff --git a/Gallery.xcodeproj/project.pbxproj b/Gallery.xcodeproj/project.pbxproj
index 2da7f6b..b359e39 100644
--- a/Gallery.xcodeproj/project.pbxproj
+++ b/Gallery.xcodeproj/project.pbxproj
@@ -8,30 +8,30 @@
 
 /* Begin PBXBuildFile section */
 		03093523235660E100E44910 /* ReverseImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03093522235660E100E44910 /* ReverseImageViewController.swift */; };
-		030935252356833A00E44910 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030935242356833A00E44910 /* InfoViewController.swift */; };
+		030935252356833A00E44910 /* PostInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 030935242356833A00E44910 /* PostInfoViewController.swift */; };
 		0361A4F8234690C000639E67 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A4F7234690C000639E67 /* AppDelegate.swift */; };
 		0361A4FA234690C000639E67 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A4F9234690C000639E67 /* SceneDelegate.swift */; };
-		0361A4FC234690C000639E67 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A4FB234690C000639E67 /* ViewController.swift */; };
+		0361A4FC234690C000639E67 /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A4FB234690C000639E67 /* HomeViewController.swift */; };
 		0361A4FF234690C000639E67 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0361A4FD234690C000639E67 /* Main.storyboard */; };
 		0361A502234690C000639E67 /* Gallery.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0361A500234690C000639E67 /* Gallery.xcdatamodeld */; };
 		0361A504234690C100639E67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0361A503234690C100639E67 /* Assets.xcassets */; };
 		0361A507234690C100639E67 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0361A505234690C100639E67 /* LaunchScreen.storyboard */; };
 		0361A5102346919A00639E67 /* PostViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A50F2346919A00639E67 /* PostViewCell.swift */; };
-		0361A5122346A38100639E67 /* PostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A5112346A38100639E67 /* PostViewController.swift */; };
+		0361A5122346A38100639E67 /* PostDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A5112346A38100639E67 /* PostDetailViewController.swift */; };
 		0361A514234828D000639E67 /* EditTagsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A513234828D000639E67 /* EditTagsViewController.swift */; };
 		0361A51623482A7D00639E67 /* TagViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0361A51523482A7D00639E67 /* TagViewCell.swift */; };
 		03F92BA22349635C0000DC1C /* PostsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F92BA12349635C0000DC1C /* PostsManager.swift */; };
 		03F92BA4234967E00000DC1C /* SearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F92BA3234967E00000DC1C /* SearchViewController.swift */; };
-		03F92BA6234969800000DC1C /* TagViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F92BA5234969800000DC1C /* TagViewController.swift */; };
+		03F92BA6234969800000DC1C /* TagPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03F92BA5234969800000DC1C /* TagPreviewViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		03093522235660E100E44910 /* ReverseImageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReverseImageViewController.swift; sourceTree = "<group>"; };
-		030935242356833A00E44910 /* InfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoViewController.swift; sourceTree = "<group>"; };
+		030935242356833A00E44910 /* PostInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostInfoViewController.swift; sourceTree = "<group>"; };
 		0361A4F4234690C000639E67 /* Gallery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Gallery.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0361A4F7234690C000639E67 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		0361A4F9234690C000639E67 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
-		0361A4FB234690C000639E67 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		0361A4FB234690C000639E67 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
 		0361A4FE234690C000639E67 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		0361A501234690C000639E67 /* Gallery.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Gallery.xcdatamodel; sourceTree = "<group>"; };
 		0361A503234690C100639E67 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -39,12 +39,12 @@
 		0361A508234690C100639E67 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0361A50E234690F200639E67 /* Gallery.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Gallery.entitlements; sourceTree = "<group>"; };
 		0361A50F2346919A00639E67 /* PostViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostViewCell.swift; sourceTree = "<group>"; };
-		0361A5112346A38100639E67 /* PostViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostViewController.swift; sourceTree = "<group>"; };
+		0361A5112346A38100639E67 /* PostDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostDetailViewController.swift; sourceTree = "<group>"; };
 		0361A513234828D000639E67 /* EditTagsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTagsViewController.swift; sourceTree = "<group>"; };
 		0361A51523482A7D00639E67 /* TagViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagViewCell.swift; sourceTree = "<group>"; };
 		03F92BA12349635C0000DC1C /* PostsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostsManager.swift; sourceTree = "<group>"; };
 		03F92BA3234967E00000DC1C /* SearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewController.swift; sourceTree = "<group>"; };
-		03F92BA5234969800000DC1C /* TagViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagViewController.swift; sourceTree = "<group>"; };
+		03F92BA5234969800000DC1C /* TagPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagPreviewViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -80,21 +80,21 @@
 				0361A50E234690F200639E67 /* Gallery.entitlements */,
 				0361A4F7234690C000639E67 /* AppDelegate.swift */,
 				0361A4F9234690C000639E67 /* SceneDelegate.swift */,
-				0361A4FB234690C000639E67 /* ViewController.swift */,
+				0361A4FB234690C000639E67 /* HomeViewController.swift */,
 				0361A4FD234690C000639E67 /* Main.storyboard */,
 				0361A503234690C100639E67 /* Assets.xcassets */,
 				0361A505234690C100639E67 /* LaunchScreen.storyboard */,
 				0361A508234690C100639E67 /* Info.plist */,
 				0361A500234690C000639E67 /* Gallery.xcdatamodeld */,
 				0361A50F2346919A00639E67 /* PostViewCell.swift */,
-				0361A5112346A38100639E67 /* PostViewController.swift */,
+				0361A5112346A38100639E67 /* PostDetailViewController.swift */,
 				0361A513234828D000639E67 /* EditTagsViewController.swift */,
 				0361A51523482A7D00639E67 /* TagViewCell.swift */,
 				03F92BA12349635C0000DC1C /* PostsManager.swift */,
 				03F92BA3234967E00000DC1C /* SearchViewController.swift */,
-				03F92BA5234969800000DC1C /* TagViewController.swift */,
+				03F92BA5234969800000DC1C /* TagPreviewViewController.swift */,
 				03093522235660E100E44910 /* ReverseImageViewController.swift */,
-				030935242356833A00E44910 /* InfoViewController.swift */,
+				030935242356833A00E44910 /* PostInfoViewController.swift */,
 			);
 			path = Gallery;
 			sourceTree = "<group>";
@@ -172,14 +172,14 @@
 			files = (
 				03F92BA4234967E00000DC1C /* SearchViewController.swift in Sources */,
 				03F92BA22349635C0000DC1C /* PostsManager.swift in Sources */,
-				0361A5122346A38100639E67 /* PostViewController.swift in Sources */,
+				0361A5122346A38100639E67 /* PostDetailViewController.swift in Sources */,
 				0361A502234690C000639E67 /* Gallery.xcdatamodeld in Sources */,
-				0361A4FC234690C000639E67 /* ViewController.swift in Sources */,
+				0361A4FC234690C000639E67 /* HomeViewController.swift in Sources */,
 				0361A51623482A7D00639E67 /* TagViewCell.swift in Sources */,
 				03093523235660E100E44910 /* ReverseImageViewController.swift in Sources */,
-				03F92BA6234969800000DC1C /* TagViewController.swift in Sources */,
+				03F92BA6234969800000DC1C /* TagPreviewViewController.swift in Sources */,
 				0361A4F8234690C000639E67 /* AppDelegate.swift in Sources */,
-				030935252356833A00E44910 /* InfoViewController.swift in Sources */,
+				030935252356833A00E44910 /* PostInfoViewController.swift in Sources */,
 				0361A514234828D000639E67 /* EditTagsViewController.swift in Sources */,
 				0361A4FA234690C000639E67 /* SceneDelegate.swift in Sources */,
 				0361A5102346919A00639E67 /* PostViewCell.swift in Sources */,
diff --git a/Gallery/Base.lproj/Main.storyboard b/Gallery/Base.lproj/Main.storyboard
index 1823466..ec659c1 100644
--- a/Gallery/Base.lproj/Main.storyboard
+++ b/Gallery/Base.lproj/Main.storyboard
@@ -27,7 +27,7 @@
         <!--Home-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="HomeViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -95,7 +95,7 @@
         <!--Post-->
         <scene sceneID="El6-Kv-Gbq">
             <objects>
-                <viewController storyboardIdentifier="PostViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="jQf-RA-c2I" customClass="PostViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PostViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="jQf-RA-c2I" customClass="PostDetailViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8Jm-eh-tzq">
                         <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -200,7 +200,7 @@
                                 </connections>
                             </tableView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tags" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Avc-oj-cgH">
-                                <rect key="frame" x="141" y="34" width="38" height="20"/>
+                                <rect key="frame" x="141" y="34" width="38" height="19"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -215,6 +215,9 @@
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iWK-vF-Vze">
                                 <rect key="frame" x="16" y="28" width="30" height="31"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="31" id="hL7-pF-7ct"/>
+                                </constraints>
                                 <state key="normal" title="Edit"/>
                                 <connections>
                                     <action selector="editAction:" destination="3TL-qD-pbO" eventType="touchDown" id="5er-HM-8S2"/>
@@ -224,16 +227,17 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="Avc-oj-cgH" firstAttribute="centerX" secondItem="FH2-sj-H4t" secondAttribute="centerX" id="0Gc-7b-iOz"/>
-                            <constraint firstItem="iWK-vF-Vze" firstAttribute="top" secondItem="QZA-mC-Y5U" secondAttribute="top" constant="15" id="1GH-Ph-jLQ"/>
-                            <constraint firstItem="2po-UQ-V0K" firstAttribute="top" secondItem="iWK-vF-Vze" secondAttribute="bottom" constant="15" id="Tfw-tD-NIh"/>
+                            <constraint firstItem="iWK-vF-Vze" firstAttribute="centerY" secondItem="Avc-oj-cgH" secondAttribute="centerY" id="1Vu-TN-4lR"/>
+                            <constraint firstItem="iWK-vF-Vze" firstAttribute="leading" secondItem="2po-UQ-V0K" secondAttribute="leading" id="ESK-L1-xKn"/>
                             <constraint firstItem="bb4-UL-VAQ" firstAttribute="top" secondItem="2po-UQ-V0K" secondAttribute="bottom" constant="16" id="Tza-Yu-GJy"/>
+                            <constraint firstItem="iWK-vF-Vze" firstAttribute="top" secondItem="QZA-mC-Y5U" secondAttribute="top" constant="15" id="WIR-rl-OcU"/>
                             <constraint firstItem="QZA-mC-Y5U" firstAttribute="trailing" secondItem="bb4-UL-VAQ" secondAttribute="trailing" constant="16" id="Y0t-Xb-GeO"/>
                             <constraint firstItem="bb4-UL-VAQ" firstAttribute="leading" secondItem="QZA-mC-Y5U" secondAttribute="leading" constant="16" id="dU7-AM-rdu"/>
                             <constraint firstItem="2po-UQ-V0K" firstAttribute="leading" secondItem="QZA-mC-Y5U" secondAttribute="leading" constant="16" id="h3a-gQ-AeR"/>
-                            <constraint firstItem="iWK-vF-Vze" firstAttribute="leading" secondItem="QZA-mC-Y5U" secondAttribute="leading" constant="16" id="hJB-8r-k89"/>
                             <constraint firstItem="QZA-mC-Y5U" firstAttribute="trailing" secondItem="2po-UQ-V0K" secondAttribute="trailing" constant="16" id="mcC-aj-xcR"/>
                             <constraint firstItem="QZA-mC-Y5U" firstAttribute="bottom" secondItem="bb4-UL-VAQ" secondAttribute="bottom" constant="16" id="o9M-an-8qu"/>
                             <constraint firstItem="Avc-oj-cgH" firstAttribute="top" secondItem="QZA-mC-Y5U" secondAttribute="top" constant="21" id="sTL-Nv-S4n"/>
+                            <constraint firstItem="2po-UQ-V0K" firstAttribute="top" secondItem="iWK-vF-Vze" secondAttribute="bottom" constant="15" id="wQZ-ph-WmG"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="QZA-mC-Y5U"/>
                     </view>
@@ -247,10 +251,10 @@
             </objects>
             <point key="canvasLocation" x="997.5" y="850"/>
         </scene>
-        <!--Info View Controller-->
+        <!--Post Info View Controller-->
         <scene sceneID="w3u-pt-BtZ">
             <objects>
-                <viewController storyboardIdentifier="InfoViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="MaR-nc-wxI" customClass="InfoViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="InfoViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="MaR-nc-wxI" customClass="PostInfoViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="VFL-0t-HSi">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="493"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -315,21 +319,21 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dtc-GD-q7J">
                                 <rect key="frame" x="734" y="20" width="46" height="31"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="46" id="jzo-YK-PFI"/>
+                                    <constraint firstAttribute="width" constant="46" id="EwI-z9-e4N"/>
                                 </constraints>
                                 <state key="normal" title="Done"/>
                             </button>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="rUi-3B-MYc" firstAttribute="top" secondItem="ZJg-bs-auM" secondAttribute="top" constant="20" id="9rH-KP-fyh"/>
-                            <constraint firstItem="uq3-56-0hX" firstAttribute="top" secondItem="dtc-GD-q7J" secondAttribute="bottom" constant="8" id="Rrv-D5-qvg"/>
-                            <constraint firstItem="uq3-56-0hX" firstAttribute="leading" secondItem="ZJg-bs-auM" secondAttribute="leading" id="Si3-C6-jg1"/>
-                            <constraint firstItem="uq3-56-0hX" firstAttribute="bottom" secondItem="ZJg-bs-auM" secondAttribute="bottom" id="TqS-rI-R3m"/>
-                            <constraint firstItem="uq3-56-0hX" firstAttribute="centerX" secondItem="TNu-lY-cd3" secondAttribute="centerX" id="XC5-nd-kiz"/>
-                            <constraint firstItem="rUi-3B-MYc" firstAttribute="leading" secondItem="TNu-lY-cd3" secondAttribute="leadingMargin" id="m4y-yq-AIi"/>
-                            <constraint firstItem="rUi-3B-MYc" firstAttribute="baseline" secondItem="dtc-GD-q7J" secondAttribute="baseline" id="pgb-bf-IaK"/>
-                            <constraint firstItem="dtc-GD-q7J" firstAttribute="trailing" secondItem="TNu-lY-cd3" secondAttribute="trailingMargin" id="tkL-yp-n5c"/>
+                            <constraint firstItem="dtc-GD-q7J" firstAttribute="trailing" secondItem="TNu-lY-cd3" secondAttribute="trailingMargin" id="0xJ-7q-dTi"/>
+                            <constraint firstItem="rUi-3B-MYc" firstAttribute="leading" secondItem="TNu-lY-cd3" secondAttribute="leadingMargin" id="Oew-rh-KuM"/>
+                            <constraint firstItem="uq3-56-0hX" firstAttribute="leading" secondItem="ZJg-bs-auM" secondAttribute="leading" id="WRh-MW-kF5"/>
+                            <constraint firstItem="uq3-56-0hX" firstAttribute="top" secondItem="rUi-3B-MYc" secondAttribute="bottom" constant="8" id="cx8-FB-IwA"/>
+                            <constraint firstItem="uq3-56-0hX" firstAttribute="centerX" secondItem="TNu-lY-cd3" secondAttribute="centerX" id="gu9-MK-Lmd"/>
+                            <constraint firstItem="uq3-56-0hX" firstAttribute="bottom" secondItem="ZJg-bs-auM" secondAttribute="bottom" id="hkP-Xs-feE"/>
+                            <constraint firstItem="rUi-3B-MYc" firstAttribute="top" secondItem="ZJg-bs-auM" secondAttribute="top" constant="20" id="qjo-h1-A9Y"/>
+                            <constraint firstItem="dtc-GD-q7J" firstAttribute="baseline" secondItem="rUi-3B-MYc" secondAttribute="baseline" id="uaC-8b-aYo"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="ZJg-bs-auM"/>
                     </view>
@@ -410,10 +414,10 @@
             </objects>
             <point key="canvasLocation" x="132.75" y="850"/>
         </scene>
-        <!--Tag View Controller-->
+        <!--Tag Preview View Controller-->
         <scene sceneID="3aP-dA-v7Z">
             <objects>
-                <viewController id="1Lq-DE-RSc" customClass="TagViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="1Lq-DE-RSc" customClass="TagPreviewViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="YEa-YJ-CTQ">
                         <rect key="frame" x="0.0" y="0.0" width="720" height="560"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
diff --git a/Gallery/EditTagsViewController.swift b/Gallery/EditTagsViewController.swift
index 61c365f..fd1ceed 100644
--- a/Gallery/EditTagsViewController.swift
+++ b/Gallery/EditTagsViewController.swift
@@ -64,7 +64,7 @@ class EditTagsViewController: UIViewController, UITableViewDelegate, UITableView
 
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "showTag" {
-            let newViewController = segue.destination as! TagViewController
+            let newViewController = segue.destination as! TagPreviewViewController
             let index = self.tableView.indexPathForSelectedRow
             
             newViewController.tag = (post?.tags![index!.row] as! Tag).name
diff --git a/Gallery/ViewController.swift b/Gallery/HomeViewController.swift
similarity index 96%
rename from Gallery/ViewController.swift
rename to Gallery/HomeViewController.swift
index 6151876..21f59ce 100644
--- a/Gallery/ViewController.swift
+++ b/Gallery/HomeViewController.swift
@@ -1,7 +1,7 @@
 import UIKit
 import CoreData
 
-class ViewController: UIViewController, UIDocumentPickerDelegate {
+class HomeViewController: UIViewController, UIDocumentPickerDelegate {
     @IBOutlet weak var collectionView: UICollectionView!
     
     var collectionManager: PostsManager?
@@ -79,7 +79,7 @@ class ViewController: UIViewController, UIDocumentPickerDelegate {
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "showPost" {
-            let newViewController = segue.destination as! PostViewController
+            let newViewController = segue.destination as! PostDetailViewController
             let index = self.collectionView.indexPathsForSelectedItems?.first
             
             newViewController.post = self.collectionManager?.posts[index!.row]
@@ -119,7 +119,7 @@ private let OurButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "Our
 private let OurButtonToolbarIdentifier2 = NSToolbarItem.Identifier(rawValue: "OurButton2")
 private let TitlebarToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "Titlebar")
 
-extension ViewController: NSToolbarDelegate {
+extension HomeViewController: NSToolbarDelegate {
     @objc func searchAction() {
         if(navigationController?.topViewController != self) {
             navigationController?.popViewController(animated: true)
diff --git a/Gallery/PostViewController.swift b/Gallery/PostDetailViewController.swift
similarity index 95%
rename from Gallery/PostViewController.swift
rename to Gallery/PostDetailViewController.swift
index d1c290f..5cb36fd 100644
--- a/Gallery/PostViewController.swift
+++ b/Gallery/PostDetailViewController.swift
@@ -3,7 +3,7 @@ import CoreData
 import AVFoundation
 import AVKit
 
-class PostViewController: UIViewController, UIPopoverPresentationControllerDelegate {
+class PostDetailViewController: UIViewController, UIPopoverPresentationControllerDelegate {
     @IBOutlet weak var imageView: UIImageView?
     @IBOutlet weak var shareButton: UIBarButtonItem?
 
@@ -97,7 +97,7 @@ class PostViewController: UIViewController, UIPopoverPresentationControllerDeleg
             
             segue.destination.popoverPresentationController?.delegate = self
         } else if segue.identifier == "showInfo" {
-            guard let newViewController = segue.destination as? InfoViewController else {
+            guard let newViewController = segue.destination as? PostInfoViewController else {
                 return
             }
             
@@ -126,10 +126,10 @@ class PostViewController: UIViewController, UIPopoverPresentationControllerDeleg
     }
 }
 
-extension PostViewController {
-    static func loadFromStoryboard() -> PostViewController? {
+extension PostDetailViewController {
+    static func loadFromStoryboard() -> PostDetailViewController? {
         let storyboard = UIStoryboard(name: "Main", bundle: .main)
-        return storyboard.instantiateViewController(withIdentifier: "PostViewController") as? PostViewController
+        return storyboard.instantiateViewController(withIdentifier: "PostViewController") as? PostDetailViewController
     }
 }
 
@@ -140,7 +140,7 @@ private let EditButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "Ou
 private let ShareButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "OurButton2")
 private let InfoButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "OurButton3")
 
-extension PostViewController: NSToolbarDelegate {
+extension PostDetailViewController: NSToolbarDelegate {
     @objc func editTagsAction() {
         if(navigationController?.topViewController != self) {
             navigationController?.popViewController(animated: true)
diff --git a/Gallery/InfoViewController.swift b/Gallery/PostInfoViewController.swift
similarity index 91%
rename from Gallery/InfoViewController.swift
rename to Gallery/PostInfoViewController.swift
index d2b6244..ebd8d6f 100644
--- a/Gallery/InfoViewController.swift
+++ b/Gallery/PostInfoViewController.swift
@@ -2,7 +2,7 @@ import UIKit
 import CoreData
 import AVFoundation
 
-class InfoViewController: UIViewController {
+class PostInfoViewController: UIViewController {
     var post: Post?
     var image: UIImage?
     
@@ -56,9 +56,9 @@ class InfoViewController: UIViewController {
     }
 }
 
-extension InfoViewController {
-    static func loadFromStoryboard() -> InfoViewController? {
+extension PostInfoViewController {
+    static func loadFromStoryboard() -> PostInfoViewController? {
         let storyboard = UIStoryboard(name: "Main", bundle: .main)
-        return storyboard.instantiateViewController(withIdentifier: "InfoViewController") as? InfoViewController
+        return storyboard.instantiateViewController(withIdentifier: "InfoViewController") as? PostInfoViewController
     }
 }
diff --git a/Gallery/PostsManager.swift b/Gallery/PostsManager.swift
index 0065ed0..a6452c6 100644
--- a/Gallery/PostsManager.swift
+++ b/Gallery/PostsManager.swift
@@ -218,7 +218,7 @@ class PostsManager: NSObject, UICollectionViewDataSource, UICollectionViewDelega
 
             let cell = self.collectionView?.cellForItem(at: IndexPath(row: index!, section: 0)) as! PostViewCell
             
-            let viewController = InfoViewController.loadFromStoryboard()
+            let viewController = PostInfoViewController.loadFromStoryboard()
             viewController!.post = post as? Post
             viewController!.image = cell.imageView.image
             
diff --git a/Gallery/SceneDelegate.swift b/Gallery/SceneDelegate.swift
index c3c5cf9..ae7d5fc 100644
--- a/Gallery/SceneDelegate.swift
+++ b/Gallery/SceneDelegate.swift
@@ -60,7 +60,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func configure(window: UIWindow?, with activity: NSUserActivity) -> Bool {
         if activity.activityType == "post" {
             if let post = getPostFromActivity(activity: activity) {
-                if let photoDetailViewController = PostViewController.loadFromStoryboard() {
+                if let photoDetailViewController = PostDetailViewController.loadFromStoryboard() {
                     photoDetailViewController.post = post
                     photoDetailViewController.isPopup = true
                     
diff --git a/Gallery/SearchViewController.swift b/Gallery/SearchViewController.swift
index 38f43c0..c22b824 100644
--- a/Gallery/SearchViewController.swift
+++ b/Gallery/SearchViewController.swift
@@ -16,7 +16,7 @@ class SearchViewController: UIViewController {
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "showPost" {
-            let newViewController = segue.destination as! PostViewController
+            let newViewController = segue.destination as! PostDetailViewController
             let index = self.collectionView.indexPathsForSelectedItems?.first
             
             newViewController.post = self.postManager?.posts[index!.row]
diff --git a/Gallery/TagViewController.swift b/Gallery/TagPreviewViewController.swift
similarity index 87%
rename from Gallery/TagViewController.swift
rename to Gallery/TagPreviewViewController.swift
index ad992cb..da35c0f 100644
--- a/Gallery/TagViewController.swift
+++ b/Gallery/TagPreviewViewController.swift
@@ -1,7 +1,7 @@
 import UIKit
 import CoreData
 
-class TagViewController: UIViewController {
+class TagPreviewViewController: UIViewController {
     var tag: String?
     
     var collectionManager: PostsManager?
@@ -22,7 +22,7 @@ class TagViewController: UIViewController {
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == "showPost" {
-            let newViewController = segue.destination as! PostViewController
+            let newViewController = segue.destination as! PostDetailViewController
             let index = self.collectionView.indexPathsForSelectedItems?.first
             
             newViewController.post = self.collectionManager?.posts[index!.row]