diff --git a/OnePassword.xcodeproj/project.pbxproj b/OnePassword.xcodeproj/project.pbxproj
index e434602a..11b0a415 100644
--- a/OnePassword.xcodeproj/project.pbxproj
+++ b/OnePassword.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		DA007F5214B24DCD00251337 /* OPConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = DA007F5114B24DCD00251337 /* OPConfig.m */; };
 		DA007F5514B25EE100251337 /* ciphers.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA007F5414B25EE100251337 /* ciphers.plist */; };
-		DA007F5614B26EFA00251337 /* Pearl.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAC77CD41482AAD600BCF976 /* Pearl.strings */; };
 		DA04E33E14B1E70400ECA4F3 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */; };
 		DA0A848C14C4DFCB0090EA8E /* OPElementGeneratedEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0A848B14C4DFCB0090EA8E /* OPElementGeneratedEntity.m */; };
 		DA0B951114C2D69E001D4EB1 /* help.html in Resources */ = {isa = PBXBuildFile; fileRef = DA0B951014C2D69E001D4EB1 /* help.html */; };
@@ -375,6 +374,7 @@
 		DA5DB7A814BE4B4B002DD256 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA5DB7A714BE4B4B002DD256 /* Default@2x.png */; };
 		DA7659AF14C5E22E00769249 /* Square-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7659AD14C5E22E00769249 /* Square-bottom.png */; };
 		DA7659B014C5E22E00769249 /* Square-top.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7659AE14C5E22E00769249 /* Square-top.png */; };
+		DA7974C114C8C69F00A71457 /* Pearl.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAC77CD41482AAD600BCF976 /* Pearl.strings */; };
 		DAC6325E1486805C0075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DAC63277148680700075AEA5 /* libuicolor-utilities.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6325D1486805C0075AEA5 /* libuicolor-utilities.a */; };
@@ -1027,7 +1027,7 @@
 		DAC77CD01482AAD600BCF976 /* PearlStrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlStrings.h; sourceTree = "<group>"; };
 		DAC77CD11482AAD600BCF976 /* PearlStrings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlStrings.m; sourceTree = "<group>"; };
 		DAC77CD21482AAD600BCF976 /* Resettable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Resettable.h; sourceTree = "<group>"; };
-		DAC77CD51482AAD600BCF976 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Pearl.strings; sourceTree = "<group>"; };
+		DAC77CD51482AAD600BCF976 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Pearl.strings; sourceTree = "<group>"; };
 		DAC77CD61482AAD600BCF976 /* Strings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Strings.h; sourceTree = "<group>"; };
 		DAC77CD71482AAD600BCF976 /* Strings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Strings.m; sourceTree = "<group>"; };
 		DAC77CD81482AAD600BCF976 /* StringUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringUtils.h; sourceTree = "<group>"; };
@@ -4200,7 +4200,6 @@
 				DA5BFA5E147E415C00F98B1E /* MainStoryboard_iPhone.storyboard in Resources */,
 				DA5BFA61147E415C00F98B1E /* MainStoryboard_iPad.storyboard in Resources */,
 				DA007F5514B25EE100251337 /* ciphers.plist in Resources */,
-				DA007F5614B26EFA00251337 /* Pearl.strings in Resources */,
 				DA5DB7A614BE4B19002DD256 /* Default.png in Resources */,
 				DA5DB7A814BE4B4B002DD256 /* Default@2x.png in Resources */,
 				DAE998D214C1D2A0002D7C22 /* Content-Backdrop.png in Resources */,
@@ -4681,6 +4680,7 @@
 				DA7659AF14C5E22E00769249 /* Square-bottom.png in Resources */,
 				DA7659B014C5E22E00769249 /* Square-top.png in Resources */,
 				DADC3C4D14C62B350091CB4D /* Settings.bundle in Resources */,
+				DA7974C114C8C69F00A71457 /* Pearl.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/OnePassword/OPMainViewController.m b/OnePassword/OPMainViewController.m
index 01371b6d..23968352 100644
--- a/OnePassword/OPMainViewController.m
+++ b/OnePassword/OPMainViewController.m
@@ -122,6 +122,9 @@
     
     self.contentField.enabled = NO;
     
+    if ([self.activeElement isKindOfClass:[OPElementGeneratedEntity class]])
+        self.passwordCounter.text = [NSString stringWithFormat:@"%d", ((OPElementGeneratedEntity *) self.activeElement).counter];
+    
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
         NSString *contentDescription = self.activeElement.contentDescription;
         dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/OnePassword/Settings.bundle/en.lproj/Root.strings b/OnePassword/Settings.bundle/English.lproj/Root.strings
similarity index 100%
rename from OnePassword/Settings.bundle/en.lproj/Root.strings
rename to OnePassword/Settings.bundle/English.lproj/Root.strings
diff --git a/OnePassword/en.lproj/MainStoryboard_iPhone.storyboard b/OnePassword/en.lproj/MainStoryboard_iPhone.storyboard
index 42c351f5..1859325a 100644
--- a/OnePassword/en.lproj/MainStoryboard_iPhone.storyboard
+++ b/OnePassword/en.lproj/MainStoryboard_iPhone.storyboard
@@ -367,6 +367,21 @@
         <scene sceneID="U26-Zf-euQ">
             <objects>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mK2-p1-3zC" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <customObject id="0QO-2P-OhD" customClass="OPSearchDelegate">
+                    <connections>
+                        <outlet property="delegate" destination="PQa-Xl-A3x" id="O2f-mW-ab8"/>
+                        <outlet property="searchDisplayController" destination="P8c-gf-nN3" id="exk-dS-Ui3"/>
+                    </connections>
+                </customObject>
+                <searchDisplayController id="P8c-gf-nN3">
+                    <connections>
+                        <outlet property="delegate" destination="0QO-2P-OhD" id="gst-Hm-5ja"/>
+                        <outlet property="searchBar" destination="qeo-n2-WVh" id="bFO-FC-Xdj"/>
+                        <outlet property="searchContentsController" destination="PQa-Xl-A3x" id="iEu-t3-hJY"/>
+                        <outlet property="searchResultsDataSource" destination="0QO-2P-OhD" id="XJh-rC-kId"/>
+                        <outlet property="searchResultsDelegate" destination="0QO-2P-OhD" id="Bm8-Q3-lLA"/>
+                    </connections>
+                </searchDisplayController>
                 <viewController id="PQa-Xl-A3x" customClass="OPMainViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ep0-Hn-5TR">
                         <rect key="frame" x="0.0" y="64" width="320" height="416"/>
@@ -535,7 +550,7 @@
                         <outlet property="contentField" destination="fiX-10-fif" id="b2c-gv-qMp"/>
                         <outlet property="helpContainer" destination="61G-By-qLB" id="Jwt-0d-ZAV"/>
                         <outlet property="helpView" destination="8FQ-x4-lR9" id="MOg-5s-kvK"/>
-                        <outlet property="passwordCounter" destination="Iuf-np-e9C" id="KHv-8K-K0s"/>
+                        <outlet property="passwordCounter" destination="Iuf-np-e9C" id="CIm-Mk-nJh"/>
                         <outlet property="passwordEdit" destination="9FS-fS-xH6" id="YeB-HF-ZPk"/>
                         <outlet property="passwordIncrementer" destination="jec-mu-nPt" id="i9B-lX-zzX"/>
                         <outlet property="searchDisplayController" destination="P8c-gf-nN3" id="CLs-YI-7NC"/>
@@ -544,21 +559,6 @@
                         <outlet property="typeButton" destination="Cei-5z-uWE" id="4M1-d7-5Bh"/>
                     </connections>
                 </viewController>
-                <customObject id="0QO-2P-OhD" customClass="OPSearchDelegate">
-                    <connections>
-                        <outlet property="delegate" destination="PQa-Xl-A3x" id="O2f-mW-ab8"/>
-                        <outlet property="searchDisplayController" destination="P8c-gf-nN3" id="exk-dS-Ui3"/>
-                    </connections>
-                </customObject>
-                <searchDisplayController id="P8c-gf-nN3">
-                    <connections>
-                        <outlet property="delegate" destination="0QO-2P-OhD" id="gst-Hm-5ja"/>
-                        <outlet property="searchBar" destination="qeo-n2-WVh" id="bFO-FC-Xdj"/>
-                        <outlet property="searchContentsController" destination="PQa-Xl-A3x" id="iEu-t3-hJY"/>
-                        <outlet property="searchResultsDataSource" destination="0QO-2P-OhD" id="XJh-rC-kId"/>
-                        <outlet property="searchResultsDelegate" destination="0QO-2P-OhD" id="Bm8-Q3-lLA"/>
-                    </connections>
-                </searchDisplayController>
             </objects>
             <point key="canvasLocation" x="455" y="182"/>
         </scene>
@@ -595,37 +595,6 @@
         <image name="list_middle_active.png" width="299" height="34"/>
         <image name="plus.png" width="32" height="32"/>
     </resources>
-    <classes>
-        <class className="OPMainViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/OPMainViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="copyContent"/>
-                <relationship kind="action" name="editPassword"/>
-                <relationship kind="action" name="incrementPasswordCounter"/>
-                <relationship kind="action" name="toggleHelp"/>
-                <relationship kind="outlet" name="contentContainer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="contentField" candidateClass="UITextField"/>
-                <relationship kind="outlet" name="helpContainer" candidateClass="UIView"/>
-                <relationship kind="outlet" name="helpView" candidateClass="UIWebView"/>
-                <relationship kind="outlet" name="passwordCounter" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="passwordEdit" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="passwordIncrementer" candidateClass="UIButton"/>
-                <relationship kind="outlet" name="searchResultsController" candidateClass="OPSearchDelegate"/>
-                <relationship kind="outlet" name="siteName" candidateClass="UILabel"/>
-                <relationship kind="outlet" name="typeButton" candidateClass="UIButton"/>
-            </relationships>
-        </class>
-        <class className="OPSearchDelegate" superclassName="NSObject">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/OPSearchDelegate.h"/>
-            <relationships>
-                <relationship kind="outlet" name="delegate"/>
-                <relationship kind="outlet" name="searchDisplayController" candidateClass="UISearchDisplayController"/>
-            </relationships>
-        </class>
-        <class className="OPTypeViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/OPTypeViewController.h"/>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>