Made some changes to prevent auto layout related crashes on iOS 6
Removed some un-needed properties