diff --git a/The Mac Weekly.xcodeproj/project.pbxproj b/The Mac Weekly.xcodeproj/project.pbxproj
index 8696942..e44083d 100644
--- a/The Mac Weekly.xcodeproj/project.pbxproj	
+++ b/The Mac Weekly.xcodeproj/project.pbxproj	
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		0014B205211271C1005B410E /* UILabel+HTML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0014B204211271C1005B410E /* UILabel+HTML.swift */; };
 		0014B206211271C1005B410E /* UILabel+HTML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0014B204211271C1005B410E /* UILabel+HTML.swift */; };
-		0024649A21508FF100DF0038 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0024649921508FF100DF0038 /* GoogleService-Info.plist */; };
 		00341DB7215DC85300D07762 /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00341DB6215DC85300D07762 /* SettingsTableViewController.swift */; };
 		00341DB8215DC85300D07762 /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00341DB6215DC85300D07762 /* SettingsTableViewController.swift */; };
 		0039066F215E81E80001A88A /* AccountSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0039066E215E81E80001A88A /* AccountSettingsTableViewController.swift */; };
@@ -17,6 +16,7 @@
 		00393584216D461D00464D95 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00393583216D461D00464D95 /* AboutViewController.swift */; };
 		00393585216D461D00464D95 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00393583216D461D00464D95 /* AboutViewController.swift */; };
 		003CB0EC20DDAF18001A790B /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 003CB0EB20DDAF18001A790B /* LoginViewController.swift */; };
+		00C971A9214DDB26000864BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 00C971A8214DDB26000864BC /* GoogleService-Info.plist */; };
 		2441FE8720717F4700FFF7D4 /* LandingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2441FE8620717F4700FFF7D4 /* LandingViewController.swift */; };
 		2441FE8920719FE300FFF7D4 /* NavbarExtensionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2441FE8820719FE300FFF7D4 /* NavbarExtensionView.swift */; };
 		24D46E5520704D0600457038 /* PostTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24D46E5420704D0600457038 /* PostTableViewCell.xib */; };
@@ -38,6 +38,8 @@
 		67E2FC262030E423000FD5BE /* PostTableViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 67E2FC242030E422000FD5BE /* PostTableViewController.storyboard */; };
 		AE7E53254523D4266FBF195F /* Pods_The_Mac_Weekly.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BAAC00BD8C48F155EEFCA94 /* Pods_The_Mac_Weekly.framework */; };
 		CBFB36ABF45CD017F26735B5 /* Pods_The_Mac_WeeklyUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC1B70C2E1F13089716348D /* Pods_The_Mac_WeeklyUITests.framework */; };
+		DF1537F22179256800EC048B /* utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67039EC3202AD158009357FF /* utils.swift */; };
+		DF1537F32179257A00EC048B /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 003CB0EB20DDAF18001A790B /* LoginViewController.swift */; };
 		FC129842C382CCC0B5715925 /* Pods_The_Mac_WeeklyTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F064AFB1504B1B2B0F0DA185 /* Pods_The_Mac_WeeklyTests.framework */; };
 /* End PBXBuildFile section */
 
@@ -65,6 +67,7 @@
 		0039066E215E81E80001A88A /* AccountSettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSettingsTableViewController.swift; sourceTree = "<group>"; };
 		00393583216D461D00464D95 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
 		003CB0EB20DDAF18001A790B /* LoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
+		00C971A8214DDB26000864BC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		1BAAC00BD8C48F155EEFCA94 /* Pods_The_Mac_Weekly.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_The_Mac_Weekly.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2045A2157C41EF5C39A058D3 /* Pods-The Mac WeeklyTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-The Mac WeeklyTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-The Mac WeeklyTests/Pods-The Mac WeeklyTests.release.xcconfig"; sourceTree = "<group>"; };
 		2441FE8620717F4700FFF7D4 /* LandingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LandingViewController.swift; sourceTree = "<group>"; };
@@ -166,6 +169,7 @@
 			children = (
 				0014B204211271C1005B410E /* UILabel+HTML.swift */,
 				67E2FC2220303277000FD5BE /* InfiniteTableView.swift */,
+				00C971A8214DDB26000864BC /* GoogleService-Info.plist */,
 				6716CA032026BE3300F008C0 /* AppDelegate.swift */,
 				678868312026C734006FCF93 /* api.swift */,
 				67E2FC242030E422000FD5BE /* PostTableViewController.storyboard */,
@@ -340,7 +344,7 @@
 				6716CA0B2026BE3400F008C0 /* Assets.xcassets in Resources */,
 				67E2FC262030E423000FD5BE /* PostTableViewController.storyboard in Resources */,
 				6716CA092026BE3400F008C0 /* Main.storyboard in Resources */,
-				0024649A21508FF100DF0038 /* GoogleService-Info.plist in Resources */,
+				00C971A9214DDB26000864BC /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -502,9 +506,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DF1537F32179257A00EC048B /* LoginViewController.swift in Sources */,
 				00390670215E81E80001A88A /* AccountSettingsTableViewController.swift in Sources */,
 				6716CA192026BE3400F008C0 /* The_Mac_WeeklyTests.swift in Sources */,
 				0014B206211271C1005B410E /* UILabel+HTML.swift in Sources */,
+				DF1537F22179256800EC048B /* utils.swift in Sources */,
 				00393585216D461D00464D95 /* AboutViewController.swift in Sources */,
 				00341DB8215DC85300D07762 /* SettingsTableViewController.swift in Sources */,
 			);
@@ -678,11 +684,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = B3GBL8CYN5;
+				DEVELOPMENT_TEAM = KQ2D936C95;
 				INFOPLIST_FILE = "The Mac Weekly/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.tmw.The-Mac-Weekly.test";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.tmw.The-Mac-Weekly-brighten";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -695,11 +701,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = B3GBL8CYN5;
+				DEVELOPMENT_TEAM = KQ2D936C95;
 				INFOPLIST_FILE = "The Mac Weekly/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "org.tmw.The-Mac-Weekly.test";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.tmw.The-Mac-Weekly-brighten";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/The Mac Weekly/Assets.xcassets/google.imageset/Contents.json b/The Mac Weekly/Assets.xcassets/google.imageset/Contents.json
new file mode 100644
index 0000000..3eb79b3
--- /dev/null
+++ b/The Mac Weekly/Assets.xcassets/google.imageset/Contents.json	
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "google.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "google@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "google@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/The Mac Weekly/Assets.xcassets/google.imageset/google.png b/The Mac Weekly/Assets.xcassets/google.imageset/google.png
new file mode 100644
index 0000000..26f15cb
Binary files /dev/null and b/The Mac Weekly/Assets.xcassets/google.imageset/google.png differ
diff --git a/The Mac Weekly/Assets.xcassets/google.imageset/google@2x.png b/The Mac Weekly/Assets.xcassets/google.imageset/google@2x.png
new file mode 100644
index 0000000..26edd54
Binary files /dev/null and b/The Mac Weekly/Assets.xcassets/google.imageset/google@2x.png differ
diff --git a/The Mac Weekly/Assets.xcassets/google.imageset/google@3x.png b/The Mac Weekly/Assets.xcassets/google.imageset/google@3x.png
new file mode 100644
index 0000000..d978ed2
Binary files /dev/null and b/The Mac Weekly/Assets.xcassets/google.imageset/google@3x.png differ
diff --git a/The Mac Weekly/Base.lproj/Main.storyboard b/The Mac Weekly/Base.lproj/Main.storyboard
index bbb5c42..a5f123c 100644
--- a/The Mac Weekly/Base.lproj/Main.storyboard	
+++ b/The Mac Weekly/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="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ax5-cg-byA">
-    <device id="retina4_7" orientation="portrait">
+    <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -186,7 +186,7 @@
             <objects>
                 <navigationController id="ax5-cg-byA" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="RZH-uN-cmE">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -202,91 +202,129 @@
             <objects>
                 <viewController storyboardIdentifier="LoginViewController" id="mfN-CY-j8u" customClass="LoginViewController" customModule="The_Mac_Weekly" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="bnZ-oR-dVq">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="43G-40-Dlm">
-                                <rect key="frame" x="127" y="20" width="120.5" height="101"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W9n-74-RRK">
+                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v2n-Ex-I51">
-                                        <rect key="frame" x="0.0" y="0.0" width="120.5" height="20.5"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="enter email" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Do9-XL-J7G">
-                                        <rect key="frame" x="0.0" y="20.5" width="120.5" height="30"/>
-                                        <nil key="textColor"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <textInputTraits key="textInputTraits"/>
-                                    </textField>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K5S-gR-Ke3">
-                                        <rect key="frame" x="0.0" y="50.5" width="120.5" height="20.5"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="enter password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="16h-38-rRj">
-                                        <rect key="frame" x="0.0" y="71" width="120.5" height="30"/>
-                                        <nil key="textColor"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <textInputTraits key="textInputTraits"/>
-                                    </textField>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="5JU-Q1-vCN">
+                                        <rect key="frame" x="96" y="30" width="128" height="136"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" secondItem="5JU-Q1-vCN" secondAttribute="height" multiplier="159:169" id="Dve-mI-6tj"/>
+                                        </constraints>
+                                    </imageView>
+                                    <stackView opaque="NO" contentMode="left" axis="vertical" spacing="9" translatesAutoresizingMaskIntoConstraints="NO" id="43G-40-Dlm">
+                                        <rect key="frame" x="35" y="196" width="250" height="108"/>
+                                        <subviews>
+                                            <textField opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="enter email" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Do9-XL-J7G">
+                                                <rect key="frame" x="0.0" y="0.0" width="250" height="30"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="30" id="HjB-jX-dxj"/>
+                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="IbT-2t-57I"/>
+                                                </constraints>
+                                                <nil key="textColor"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" textContentType="email"/>
+                                            </textField>
+                                            <textField opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="enter password" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="16h-38-rRj">
+                                                <rect key="frame" x="0.0" y="39" width="250" height="30"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="98o-fr-p9Y"/>
+                                                    <constraint firstAttribute="height" constant="30" id="S4Z-c1-k06"/>
+                                                </constraints>
+                                                <nil key="textColor"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES" textContentType="password"/>
+                                            </textField>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ssm-RE-fva">
+                                                <rect key="frame" x="0.0" y="78" width="250" height="30"/>
+                                                <color key="backgroundColor" red="0.023529411764705882" green="0.25882352941176473" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="30" id="g0M-V0-Jft"/>
+                                                </constraints>
+                                                <state key="normal" title="Log In">
+                                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="login:" destination="mfN-CY-j8u" eventType="touchUpInside" id="HQ8-t8-JTE"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="250" id="nTg-27-KW1"/>
+                                        </constraints>
+                                    </stackView>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XAh-Qh-1mU">
+                                        <rect key="frame" x="116.5" y="334" width="87" height="40"/>
+                                        <accessibility key="accessibilityConfiguration">
+                                            <accessibilityTraits key="traits" button="YES" image="YES"/>
+                                        </accessibility>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="40" id="vlr-96-u1a"/>
+                                        </constraints>
+                                        <state key="normal" title="  Sign In " image="google">
+                                            <color key="titleColor" red="0.023529411760000001" green="0.25882352939999997" blue="0.41176470590000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="googleSignIn:" destination="mfN-CY-j8u" eventType="touchUpInside" id="gHb-st-dQE"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="flq-RB-QWf">
+                                        <rect key="frame" x="89.5" y="384" width="141" height="40"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="40" id="cr3-Id-uLq"/>
+                                        </constraints>
+                                        <state key="normal" title="Create New Account"/>
+                                        <connections>
+                                            <action selector="register:" destination="mfN-CY-j8u" eventType="touchUpInside" id="77P-5l-Tr3"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
-                            </stackView>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ssm-RE-fva">
-                                <rect key="frame" x="127" y="148" width="120.5" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Login"/>
-                                <connections>
-                                    <action selector="login:" destination="mfN-CY-j8u" eventType="touchUpInside" id="HQ8-t8-JTE"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="flq-RB-QWf">
-                                <rect key="frame" x="159" y="186" width="57" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Register"/>
-                                <connections>
-                                    <action selector="register:" destination="mfN-CY-j8u" eventType="touchUpInside" id="77P-5l-Tr3"/>
-                                </connections>
-                            </button>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ptK-rV-N7Y" customClass="GIDSignInButton">
-                                <rect key="frame" x="111" y="273" width="152" height="81"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            </view>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZxX-hz-RfB">
-                                <rect key="frame" x="159" y="395" width="57" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Sign out"/>
-                                <connections>
-                                    <action selector="SignOut:" destination="mfN-CY-j8u" eventType="touchUpInside" id="A4J-r5-Hg3"/>
-                                </connections>
-                            </button>
+                                <constraints>
+                                    <constraint firstItem="XAh-Qh-1mU" firstAttribute="top" secondItem="43G-40-Dlm" secondAttribute="bottom" constant="30" id="5Ie-dR-lTG"/>
+                                    <constraint firstItem="43G-40-Dlm" firstAttribute="top" secondItem="5JU-Q1-vCN" secondAttribute="bottom" constant="30" id="I9q-yA-lNn"/>
+                                    <constraint firstItem="5JU-Q1-vCN" firstAttribute="top" secondItem="W9n-74-RRK" secondAttribute="top" constant="30" id="IKI-uI-Eha"/>
+                                    <constraint firstItem="43G-40-Dlm" firstAttribute="centerX" secondItem="W9n-74-RRK" secondAttribute="centerX" id="OdU-7n-wdO"/>
+                                    <constraint firstAttribute="trailing" secondItem="43G-40-Dlm" secondAttribute="trailing" constant="10" id="aOd-iQ-Muu"/>
+                                    <constraint firstItem="flq-RB-QWf" firstAttribute="centerX" secondItem="43G-40-Dlm" secondAttribute="centerX" id="chv-21-AvS"/>
+                                    <constraint firstItem="flq-RB-QWf" firstAttribute="top" secondItem="XAh-Qh-1mU" secondAttribute="bottom" constant="10" id="ees-QZ-aLF"/>
+                                    <constraint firstAttribute="bottom" secondItem="flq-RB-QWf" secondAttribute="bottom" constant="30" id="jKM-iZ-rhX"/>
+                                    <constraint firstItem="5JU-Q1-vCN" firstAttribute="centerX" secondItem="43G-40-Dlm" secondAttribute="centerX" id="ob1-l0-jce"/>
+                                    <constraint firstItem="XAh-Qh-1mU" firstAttribute="centerX" secondItem="43G-40-Dlm" secondAttribute="centerX" id="rDU-fZ-pZo"/>
+                                </constraints>
+                            </scrollView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="15b-rx-qOs" firstAttribute="bottom" secondItem="W9n-74-RRK" secondAttribute="bottom" id="0KY-Lf-qjw"/>
+                            <constraint firstItem="5JU-Q1-vCN" firstAttribute="width" secondItem="bnZ-oR-dVq" secondAttribute="width" multiplier="0.4" id="WaQ-Lq-O38"/>
+                            <constraint firstItem="W9n-74-RRK" firstAttribute="trailing" secondItem="15b-rx-qOs" secondAttribute="trailing" id="kzN-ZW-aN2"/>
+                            <constraint firstItem="W9n-74-RRK" firstAttribute="leading" secondItem="15b-rx-qOs" secondAttribute="leading" id="pWb-Si-APh"/>
+                            <constraint firstItem="W9n-74-RRK" firstAttribute="top" secondItem="15b-rx-qOs" secondAttribute="top" id="twY-aE-jA0"/>
+                        </constraints>
                         <viewLayoutGuide key="safeArea" id="15b-rx-qOs"/>
                     </view>
                     <connections>
                         <outlet property="emailEntry" destination="Do9-XL-J7G" id="AMP-or-Bwj"/>
                         <outlet property="passwordEntry" destination="16h-38-rRj" id="UmY-Jv-7sg"/>
+                        <outlet property="scrollView" destination="W9n-74-RRK" id="3IK-zu-AAC"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="fLK-Wy-OXj" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1135.2" y="574.36281859070471"/>
+            <point key="canvasLocation" x="-1137.68115942029" y="573.09782608695662"/>
         </scene>
         <!--Landing View Controller-->
         <scene sceneID="pya-hN-NPu">
             <objects>
                 <viewController id="hXK-Ug-ovX" customClass="LandingViewController" customModule="The_Mac_Weekly" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="glO-Hk-eme">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gwE-DA-GCn" customClass="NavbarExtensionView" customModule="The_Mac_Weekly" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="40"/>
                                 <subviews>
                                     <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fWh-hh-npi">
                                         <rect key="frame" x="-68" y="0.0" width="375" height="40"/>
@@ -316,7 +354,7 @@
                                 </constraints>
                             </view>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2lM-vR-bdd">
-                                <rect key="frame" x="0.0" y="41" width="375" height="562"/>
+                                <rect key="frame" x="0.0" y="41" width="320" height="463"/>
                                 <connections>
                                     <segue destination="DOP-hx-CPB" kind="embed" id="Qbs-n0-I6A"/>
                                 </connections>
@@ -337,7 +375,7 @@
                     <navigationItem key="navigationItem" id="GQa-IN-uUa">
                         <nil key="title"/>
                         <view key="titleView" contentMode="scaleToFill" id="6UF-en-coe">
-                            <rect key="frame" x="187.5" y="22" width="0.0" height="0.0"/>
+                            <rect key="frame" x="160" y="22" width="0.0" height="0.0"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo_window" translatesAutoresizingMaskIntoConstraints="NO" id="HQC-XZ-DJV">
@@ -394,11 +432,11 @@
             <objects>
                 <tableViewController id="81B-zM-QzH" customClass="SettingsTableViewController" customModule="The_Mac_Weekly" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="5yb-ak-mFu">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <view key="tableFooterView" contentMode="scaleToFill" misplaced="YES" id="vWe-zH-wWj">
-                            <rect key="frame" x="0.0" y="220" width="375" height="44"/>
+                            <rect key="frame" x="0.0" y="220" width="320" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
@@ -406,10 +444,10 @@
                             <tableViewSection id="zrY-Xb-cOH">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="szu-6l-RhZ">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="szu-6l-RhZ" id="mkb-oe-EjD">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Settings" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rhm-ey-SPh">
@@ -429,10 +467,10 @@
                                         </constraints>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="cAC-T3-2Pa">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="44" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cAC-T3-2Pa" id="3Qu-k3-0I8">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send Feedback" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Zj-lX-vQ9">
@@ -452,10 +490,10 @@
                                         </constraints>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="zQr-0w-e3L">
-                                        <rect key="frame" x="0.0" y="88" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="88" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zQr-0w-e3L" id="8Rj-PC-lMc">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Report Issue" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eqp-xx-bx0">
@@ -475,10 +513,10 @@
                                         </constraints>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="BAG-hi-msL">
-                                        <rect key="frame" x="0.0" y="132" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="132" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="BAG-hi-msL" id="zET-bT-zgz">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="About" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rlD-2h-f8E">
@@ -501,10 +539,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="pSA-bS-Dex">
-                                        <rect key="frame" x="0.0" y="176" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="176" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="pSA-bS-Dex" id="tef-sy-99N">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -532,29 +570,29 @@
             <objects>
                 <viewController title="About" id="Kgy-uf-e5K" customClass="AboutViewController" customModule="The_Mac_Weekly" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Fd6-QH-He9">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="hzx-ew-7LE">
-                                <rect key="frame" x="10" y="135" width="355" height="128"/>
+                                <rect key="frame" x="10" y="85.5" width="300" height="128"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="128" id="IPj-1l-QVz"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="The Mac Weekly" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QD2-uQ-jjS">
-                                <rect key="frame" x="105" y="90" width="165" height="28"/>
+                                <rect key="frame" x="77.5" y="40.5" width="165" height="28"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="23"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q6p-WY-O3U">
-                                <rect key="frame" x="126" y="291" width="123" height="21"/>
+                                <rect key="frame" x="98.5" y="241.5" width="123" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Founded by Mack Hartley, Hunter Herman, Amanda Doan and Joe Romo" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sE7-EV-kZA">
-                                <rect key="frame" x="16" y="516" width="343" height="67"/>
+                                <rect key="frame" x="16" y="417" width="288" height="67"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="67" id="HQh-kh-1k0"/>
                                 </constraints>
@@ -563,7 +601,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qYM-Vm-EDd">
-                                <rect key="frame" x="16" y="457.5" width="343" height="50.5"/>
+                                <rect key="frame" x="16" y="358.5" width="288" height="50.5"/>
                                 <string key="text">Developed by Gabriel Brown, Sammy Fritsche,
 Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare Kennedy</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -603,7 +641,7 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
                 <navigationController id="YtU-Lb-9YS" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="xV2-uT-E8R">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -620,14 +658,14 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
             <objects>
                 <viewController id="zEO-md-Vua" customClass="AuthorDetailsViewController" customModule="The_Mac_Weekly" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="JUv-1K-icJ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="BUv-Pi-aGu">
-                                <rect key="frame" x="0.0" y="79" width="375" height="588"/>
+                                <rect key="frame" x="0.0" y="79" width="320" height="489"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="gmR-uw-LMJ">
-                                        <rect key="frame" x="15" y="0.0" width="345" height="100"/>
+                                        <rect key="frame" x="15" y="0.0" width="290" height="100"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="J2H-mk-Rua">
                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
@@ -637,16 +675,16 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
                                                 </constraints>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Hgq-nv-KVn">
-                                                <rect key="frame" x="115" y="0.0" width="230" height="100"/>
+                                                <rect key="frame" x="115" y="0.0" width="175" height="100"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Johnny Appleseed" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KlF-xE-4eT">
-                                                        <rect key="frame" x="0.0" y="0.0" width="230" height="33.5"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="175" height="33.5"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="28"/>
                                                         <color key="textColor" red="0.37639653497409331" green="0.37639653497409331" blue="0.37639653497409331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" placeholderIntrinsicWidth="40" placeholderIntrinsicHeight="80" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T6d-c7-jLE">
-                                                        <rect key="frame" x="0.0" y="33.5" width="230" height="66.5"/>
+                                                        <rect key="frame" x="0.0" y="33.5" width="175" height="66.5"/>
                                                         <attributedString key="attributedText">
                                                             <fragment content="Johnny Appleseed has been writing for the Mac Weekly for nearly 50 years now. He is an expert author and a genius author.">
                                                                 <attributes>
@@ -661,7 +699,7 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
                                         </subviews>
                                     </stackView>
                                     <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wa9-gy-7Q1">
-                                        <rect key="frame" x="0.0" y="110" width="375" height="478"/>
+                                        <rect key="frame" x="0.0" y="110" width="320" height="379"/>
                                         <connections>
                                             <segue destination="85n-ck-v6d" kind="embed" identifier="" id="vSG-Wa-Vip"/>
                                         </connections>
@@ -718,11 +756,11 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
             <objects>
                 <tableViewController storyboardIdentifier="AccountSettings" title="Account Settings" id="ZQx-Rb-1cR" customClass="AccountSettingsTableViewController" customModule="The_Mac_Weekly" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Mgo-IY-hLU">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <view key="tableFooterView" contentMode="scaleToFill" id="mOj-9T-nXB">
-                            <rect key="frame" x="0.0" y="88" width="375" height="44"/>
+                            <rect key="frame" x="0.0" y="88" width="320" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
@@ -730,10 +768,10 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
                             <tableViewSection id="9la-09-ESf">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="ayp-D0-L34">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ayp-D0-L34" id="Nah-hy-TnU">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Switch Account" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BXt-0h-ogL">
@@ -753,10 +791,10 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
                                         </constraints>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="zpF-jY-Rr3">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="44" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zpF-jY-Rr3" id="3PW-nt-65Y">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Log out" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BTz-ua-nKO">
@@ -793,6 +831,7 @@ Amanda Doan, Juan David Garrido, Spencer Grant, Brighten Jelke and George Clare
         </scene>
     </scenes>
     <resources>
+        <image name="google" width="18" height="18"/>
         <image name="logo" width="356" height="354"/>
         <image name="logo_window" width="3639" height="427"/>
         <image name="settings_icon" width="24" height="24"/>
diff --git a/The Mac Weekly/LoginViewController.swift b/The Mac Weekly/LoginViewController.swift
index d285fb3..be33e7e 100644
--- a/The Mac Weekly/LoginViewController.swift	
+++ b/The Mac Weekly/LoginViewController.swift	
@@ -23,25 +23,110 @@ class LoginViewController: UIViewController, GIDSignInUIDelegate {
         
         // This is essential for our final login view controller!
         GIDSignIn.sharedInstance().uiDelegate = self
-        GIDSignIn.sharedInstance().signIn()
     }
     
     @IBAction func login(_ sender: UIButton) {
-        TestableUtils.login(email: emailEntry.text!, password: passwordEntry.text!)
+        
+        Auth.auth().signIn(withEmail: emailEntry.text!, password: passwordEntry.text!) { user, error in
+            if let error = error, user == nil {
+                self.showAlert(message: error.localizedDescription, log: "Invalid username or password")
+            }
+            else{
+                self.navigationController?.popToRootViewController(animated: true)
+            }
+        }
     }
     
     @IBAction func register(_ sender: UIButton) {
-        TestableUtils.register(email: emailEntry.text!, password: passwordEntry.text!)
+        if TestableUtils.isEmail(email: emailEntry.text!){
+            Auth.auth().createUser(withEmail: emailEntry.text!, password: passwordEntry.text!){ (authResult, error) in
+                if let error = error {
+                    self.showAlert(message: error.localizedDescription, log: "error creating new user")
+                }
+                else{
+                    Auth.auth().currentUser?.sendEmailVerification { (error) in
+                        if let error = error{
+                            self.showAlert(message: error.localizedDescription, log: "error with verication email")
+                        }
+                    }
+                    self.navigationController?.popToRootViewController(animated: true)
+                }
+            }
+        }
+        else{
+            self.showAlert(message: "incorrect email address format", log: "incorrect email address format")
+        }
+    }
+    
+    func showAlert(message: String, log: String){
+        let alert = UIAlertController(title: "Error", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: NSLocalizedString("Go back", comment: "Default action"), style: .default, handler: { _ in
+            NSLog(log)
+        }))
+        self.present(alert, animated: true, completion: nil)
     }
     
+    // is this method used?
     @IBAction func SignOut(_ sender: UIButton) {
-        TestableUtils.logout()
+        
+        if (Auth.auth().currentUser != nil){
+            do{
+                try Auth.auth().signOut()
+            }
+            catch let signOutError as NSError {
+                self.showAlert(message: signOutError.localizedDescription, log: signOutError.localizedDescription)
+            }
+            
+            GIDSignIn.sharedInstance().signOut()
+        }
+        else{
+            self.showAlert(message: "no user signed in", log: "no user signed in")
+        }
+        
     }
     
+    @IBAction func googleSignIn(_ sender: UIButton){
+        GIDSignIn.sharedInstance().signIn()
+        self.navigationController?.popToRootViewController(animated: true)
+    }
 
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
+    
+    // Handle ScrollView + keyboard interactions
+    // code from https://stackoverflow.com/a/45122844/239816
+    @IBOutlet weak var scrollView: UIScrollView!
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        registerNotifications()
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        unregisterNotifications()
+    }
+    
+    func registerNotifications() {
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: .UIKeyboardWillShow, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: .UIKeyboardWillHide, object: nil)
+    }
+    
+    func unregisterNotifications() {
+        NotificationCenter.default.removeObserver(self, name: .UIKeyboardWillShow, object: nil)
+        NotificationCenter.default.removeObserver(self, name: .UIKeyboardWillHide, object: nil)
+    }
+    
+    @objc func keyboardWillShow(notification: NSNotification){
+        guard let keyboardFrame = notification.userInfo![UIKeyboardFrameEndUserInfoKey] as? NSValue else { return }
+        scrollView.contentInset.bottom = view.convert(keyboardFrame.cgRectValue, from: nil).size.height + 20
+    }
+    
+    @objc func keyboardWillHide(notification: NSNotification){
+        scrollView.contentInset.bottom = 0
+    }
 
 }
+
diff --git a/The Mac Weekly/utils.swift b/The Mac Weekly/utils.swift
index 63805d6..747d1a7 100644
--- a/The Mac Weekly/utils.swift	
+++ b/The Mac Weekly/utils.swift	
@@ -101,6 +101,7 @@ public class TestableUtils {
         
     }
     
+    // This function is no longer used
     // Verify that a user's email meets our standards (ie is a mac.edu email)
     static func isMacalesterEmail(email: String) -> Bool {
         
@@ -111,9 +112,20 @@ public class TestableUtils {
         let doesMatch = email.range(of: pattern, options: [.regularExpression, .caseInsensitive]) != nil
         
         return doesMatch
+    }
+    
+    // verify that input is a valid email format (not specifically macalester)
+    // code from: https://stackoverflow.com/a/35789191
+    static func isEmail(email:String) -> Bool {
+        
+        let emailFormat = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
+        let emailPredicate = NSPredicate(format:"SELF MATCHES %@", emailFormat)
+        // guide to filtering with predicate: https://nshipster.com/nspredicate/
+        return emailPredicate.evaluate(with: email)
         
     }
     
+    // Log in a user through Firebase
     // Log in a user through Firebase
     static func login(email: String, password: String) {
         
@@ -129,12 +141,13 @@ public class TestableUtils {
         }
     }
     
+    
     // Register a new user
-    static func register(email: String, password: String) {
-        
-        // TODO: Replace all print statements with logs once we have that set up
+    static func register(email: String, password: String){
         
-        if isMacalesterEmail(email: email) {
+        if isEmail(email: email) {
+            
+            var message = ""
             
             // NOTE: this automatically signs in this new user
             Auth.auth().createUser(withEmail: email, password: password) { (authResult, error) in
@@ -150,24 +163,21 @@ public class TestableUtils {
                         if let error = error {
                             print(error)
                         }
-                        else {
+                        else{
                             print("Verification email sent successfully")
                         }
-
                     }
                 }
             }
         }
             
         else {
-            print("Not a valid email")
+          print("not a valid email address")
         }
     }
     
     // Log current user out of firebase and out of their google account
-    static func logout() {
-        
-        // TODO: Replace all print statements with logs once we have that set up
+    static func logout(){
         
         if (Auth.auth().currentUser != nil) {
         
@@ -186,15 +196,19 @@ public class TestableUtils {
             print("Logged out of Google account")
             
         }
+        else if (GIDSignIn.sharedInstance().currentUser != nil){
+            GIDSignIn.sharedInstance().signOut()
+        }
         else {
             print("No user signed in")
         }
+        
     }
     
     // Check login status without having to import firebase auth
     static func isLoggedIn() -> Bool {
         
-        return Auth.auth().currentUser != nil
+        return Auth.auth().currentUser != nil || GIDSignIn.sharedInstance().currentUser != nil
         
     }
 
diff --git a/The Mac WeeklyTests/The_Mac_WeeklyTests.swift b/The Mac WeeklyTests/The_Mac_WeeklyTests.swift
index 9ccd4ca..03b5904 100644
--- a/The Mac WeeklyTests/The_Mac_WeeklyTests.swift	
+++ b/The Mac WeeklyTests/The_Mac_WeeklyTests.swift	
@@ -83,6 +83,24 @@ class The_Mac_WeeklyTests: XCTestCase {
         XCTAssertTrue(TestableUtils.isMacalesterEmail(email: "example@MaCaLeStEr.EdU"))
     }
     
+    func testRejectInvalidEmailFormat(){
+        XCTAssertFalse(TestableUtils.isEmail(email: "example.com"))
+        XCTAssertFalse(TestableUtils.isEmail(email: "example@yahoo"))
+        XCTAssertFalse(TestableUtils.isEmail(email: "@yahoo.net"))
+        XCTAssertFalse(TestableUtils.isEmail(email: "@."))
+        XCTAssertFalse(TestableUtils.isEmail(email: "example@gmail."))
+        XCTAssertFalse(TestableUtils.isEmail(email: "example@.edu"))
+        XCTAssertFalse(TestableUtils.isEmail(email: "example@gmail.comexample@.edu"))
+        XCTAssertFalse(TestableUtils.isEmail(email: "exa mple@gma il.ed u"))
+    }
+    
+    func testAcceptAnyEmail(){
+        XCTAssertTrue(TestableUtils.isEmail(email: "example@yahoo.com"))
+        XCTAssertTrue(TestableUtils.isEmail(email: "example@macalester.edu"))
+        XCTAssertTrue(TestableUtils.isEmail(email: "example@gmail.com"))
+        XCTAssertTrue(TestableUtils.isEmail(email: "ANyThiNG@cOMCaSt.NeT"))
+    }
+    
     
     func testPerformanceExample() {
         // This is an example of a performance test case.