Fixed messed up layout for iOS8