Fixed auto-layout issues between iPhone 4 and 5