diff --git a/Assets/Screenshots/Attachments.png b/Assets/Screenshots/Attachments.png
new file mode 100644
index 00000000..e3086962
Binary files /dev/null and b/Assets/Screenshots/Attachments.png differ
diff --git a/Assets/Screenshots/CustomFields.png b/Assets/Screenshots/CustomFields.png
index 9d1f3ba3..5ae22952 100644
Binary files a/Assets/Screenshots/CustomFields.png and b/Assets/Screenshots/CustomFields.png differ
diff --git a/Assets/Screenshots/Locked.png b/Assets/Screenshots/Locked.png
index 21266554..624c4570 100644
Binary files a/Assets/Screenshots/Locked.png and b/Assets/Screenshots/Locked.png differ
diff --git a/Assets/Screenshots/MacPass.png b/Assets/Screenshots/MacPass.png
index bde919a6..5a3d1b59 100644
Binary files a/Assets/Screenshots/MacPass.png and b/Assets/Screenshots/MacPass.png differ
diff --git a/Assets/Screenshots/NoInspector.png b/Assets/Screenshots/NoInspector.png
new file mode 100644
index 00000000..dcaf36ae
Binary files /dev/null and b/Assets/Screenshots/NoInspector.png differ
diff --git a/Assets/Screenshots/PasswordGenerator.png b/Assets/Screenshots/PasswordGenerator.png
index 325b2125..e3818633 100644
Binary files a/Assets/Screenshots/PasswordGenerator.png and b/Assets/Screenshots/PasswordGenerator.png differ
diff --git a/Assets/Screenshots/SetPassword.png b/Assets/Screenshots/SetPassword.png
new file mode 100644
index 00000000..bef8637c
Binary files /dev/null and b/Assets/Screenshots/SetPassword.png differ
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 36c0ad64..1233112a 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -256,6 +256,7 @@
 						<string key="NSFrame">{{0, 31}, {293, 399}}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="726109125"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<array class="NSMutableArray" key="NSTabViewItems">
 							<object class="NSTabViewItem" id="1002013291">
@@ -308,7 +309,7 @@
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="648519567">
 												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">272630784</int>
+												<int key="NSCellFlags2">272631040</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="308723166"/>
 												<string key="NSCellIdentifier">_NS:9</string>
@@ -386,7 +387,7 @@
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1007924351">
 												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">272630784</int>
+												<int key="NSCellFlags2">272631040</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="308723166"/>
 												<string key="NSCellIdentifier">_NS:9</string>
@@ -595,7 +596,7 @@
 															<int key="NSvFlags">2322</int>
 															<string key="NSFrameSize">{251, 332}</string>
 															<reference key="NSSuperview" ref="454120122"/>
-															<reference key="NSNextKeyView" ref="657519150"/>
+															<reference key="NSNextKeyView" ref="942541726"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="77792568">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -687,6 +688,7 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{236, 1}, {16, 332}}</string>
 													<reference key="NSSuperview" ref="850153963"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:83</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<reference key="NSTarget" ref="850153963"/>
@@ -711,7 +713,7 @@
 											</array>
 											<string key="NSFrame">{{20, 20}, {253, 334}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
-											<reference key="NSNextKeyView" ref="454120122"/>
+											<reference key="NSNextKeyView" ref="657519150"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133138</int>
 											<reference key="NSVScroller" ref="942541726"/>
@@ -924,6 +926,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 147}, {52, 16}}</string>
 													<reference key="NSSuperview" ref="994354248"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -1102,6 +1105,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 119}, {223, 15}}</string>
 													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -1740,8 +1744,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="87082330"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="314156867">
@@ -2291,8 +2295,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="802970543">
@@ -2323,8 +2327,24 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="775474818">
+								<reference key="firstItem" ref="13391205"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">1</int>
+								<reference key="secondItem" ref="172507372"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="400643134">
@@ -2419,8 +2439,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="806657697">
@@ -2483,8 +2503,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="502895567">
@@ -4705,6 +4725,11 @@
 						<reference key="object" ref="824671915"/>
 						<reference key="parent" ref="816254670"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2322</int>
+						<reference key="object" ref="775474818"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4790,6 +4815,7 @@
 					<reference ref="849686715"/>
 					<reference ref="989194529"/>
 					<reference ref="400643134"/>
+					<reference ref="775474818"/>
 					<reference ref="19592612"/>
 					<reference ref="802970543"/>
 					<reference ref="983418579"/>
@@ -5091,6 +5117,7 @@
 				<string key="2319.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2321.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2322.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="455.IBNSViewMetadataConstraints">
 					<reference ref="222939184"/>
 					<reference ref="1058743908"/>
@@ -5141,7 +5168,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2321</int>
+			<int key="maxID">2322</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5227,7 +5254,6 @@
 					<string key="className">MPInspectorViewController</string>
 					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="_popUpPasswordGenerator:">id</string>
 						<string key="addAttachment:">id</string>
 						<string key="addCustomField:">id</string>
 						<string key="edit:">id</string>
@@ -5237,10 +5263,6 @@
 						<string key="saveAttachment:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="_popUpPasswordGenerator:">
-							<string key="name">_popUpPasswordGenerator:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="addAttachment:">
 							<string key="name">addAttachment:</string>
 							<string key="candidateClassName">id</string>
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 2234c9f4..ca8859f9 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -44,11 +44,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2504</string>
+	<string>2506</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index d25a0661..9f0c6e57 100644
Binary files a/MacPass/de.lproj/Localizable.strings and b/MacPass/de.lproj/Localizable.strings differ
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 6f270913..dc9e1059 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ