Fixed all the views except for iOS 6 view.  This commit is right before making these changes.