diff --git a/Gallery/Base.lproj/Main.storyboard b/Gallery/Base.lproj/Main.storyboard
index dc6e788..b0b9c7f 100644
--- a/Gallery/Base.lproj/Main.storyboard
+++ b/Gallery/Base.lproj/Main.storyboard
@@ -65,10 +65,10 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstItem="nHo-hC-uT9" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" constant="25" id="715-Gf-Neb"/>
-                            <constraint firstItem="nHo-hC-uT9" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="PKo-Re-WQy"/>
-                            <constraint firstItem="nHo-hC-uT9" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="UdF-XX-6F1"/>
-                            <constraint firstItem="nHo-hC-uT9" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailingMargin" constant="20" id="ZpI-FT-bld"/>
+                            <constraint firstItem="nHo-hC-uT9" firstAttribute="bottom" secondItem="6Tk-OE-BBY" secondAttribute="bottom" id="4rZ-Za-ukx"/>
+                            <constraint firstItem="nHo-hC-uT9" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="9Yp-CZ-4Ox"/>
+                            <constraint firstItem="nHo-hC-uT9" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="Cl4-QI-W1y"/>
+                            <constraint firstItem="nHo-hC-uT9" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="p1V-UB-9bB"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                     </view>
@@ -254,7 +254,7 @@
         <!--Post Info View Controller-->
         <scene sceneID="w3u-pt-BtZ">
             <objects>
-                <viewController storyboardIdentifier="InfoViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="MaR-nc-wxI" customClass="PostInfoViewController" customModule="Gallery" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PostInfoViewController" 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"/>
diff --git a/Gallery/HomeViewController.swift b/Gallery/HomeViewController.swift
index 07e4450..c54fd97 100644
--- a/Gallery/HomeViewController.swift
+++ b/Gallery/HomeViewController.swift
@@ -61,7 +61,13 @@ class HomeViewController: UIViewController, UIDocumentPickerDelegate {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
                 
-        collectionManager = PostsManager(collectionView: collectionView, tag: tags)
+        collectionManager = PostsManager(viewController: self, collectionView: collectionView, tag: tags)
+        
+        updateWindowTitle()
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
         
         updateWindowTitle()
     }
diff --git a/Gallery/PostDetailViewController.swift b/Gallery/PostDetailViewController.swift
index 450f2a9..9905d8d 100644
--- a/Gallery/PostDetailViewController.swift
+++ b/Gallery/PostDetailViewController.swift
@@ -67,6 +67,12 @@ class PostDetailViewController: UIViewController, UIPopoverPresentationControlle
         updateWindowTitle()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        updateWindowTitle()
+    }
+    
     @objc func closePopup() {
         UIApplication.shared.requestSceneSessionDestruction((self.view.window?.windowScene!.session)!, options: nil, errorHandler: nil)
     }
diff --git a/Gallery/PostInfoViewController.swift b/Gallery/PostInfoViewController.swift
index ebd8d6f..ef11413 100644
--- a/Gallery/PostInfoViewController.swift
+++ b/Gallery/PostInfoViewController.swift
@@ -59,6 +59,6 @@ class PostInfoViewController: UIViewController {
 extension PostInfoViewController {
     static func loadFromStoryboard() -> PostInfoViewController? {
         let storyboard = UIStoryboard(name: "Main", bundle: .main)
-        return storyboard.instantiateViewController(withIdentifier: "InfoViewController") as? PostInfoViewController
+        return storyboard.instantiateViewController(withIdentifier: "PostInfoViewController") as? PostInfoViewController
     }
 }
diff --git a/Gallery/PostsManager.swift b/Gallery/PostsManager.swift
index 9d16578..94d731d 100644
--- a/Gallery/PostsManager.swift
+++ b/Gallery/PostsManager.swift
@@ -47,13 +47,12 @@ func generateThumbnail(path: URL) -> UIImage? {
 }
 
 class PostsManager: NSObject, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UICollectionViewDropDelegate, UICollectionViewDragDelegate {
+    var viewController: UIViewController?
     var collectionView : UICollectionView?
     var managedContext: NSManagedObjectContext?
     
     var posts: [NSManagedObject] = []
     
-    weak var viewController: UIViewController?
-
     private let itemsPerRow: CGFloat = 4
     
     private let sectionInsets = UIEdgeInsets(top: 10.0,
@@ -92,9 +91,10 @@ class PostsManager: NSObject, UICollectionViewDataSource, UICollectionViewDelega
         return cell
     }
     
-    init(collectionView: UICollectionView, tag: String?) {
+    init(viewController: UIViewController, collectionView: UICollectionView, tag: String?) {
         super.init()
         
+        self.viewController = viewController
         self.collectionView = collectionView
         
         collectionView.dragInteractionEnabled = true
diff --git a/Gallery/SearchViewController.swift b/Gallery/SearchViewController.swift
index c22b824..474139a 100644
--- a/Gallery/SearchViewController.swift
+++ b/Gallery/SearchViewController.swift
@@ -11,7 +11,7 @@ class SearchViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        postManager = PostsManager(collectionView: collectionView, tag: nil)
+        postManager = PostsManager(viewController: self, collectionView: collectionView, tag: nil)
     }
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
diff --git a/Gallery/TagPreviewViewController.swift b/Gallery/TagPreviewViewController.swift
index da35c0f..e29c32c 100644
--- a/Gallery/TagPreviewViewController.swift
+++ b/Gallery/TagPreviewViewController.swift
@@ -11,7 +11,7 @@ class TagPreviewViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        collectionManager = PostsManager(collectionView: collectionView, tag: nil)
+        collectionManager = PostsManager(viewController: self, collectionView: collectionView, tag: nil)
     }
     
     override func viewDidAppear(_ animated: Bool) {