Fixed freeze bug and updated layouts for iPhone 6