Resolved layout issues between 4S, 5, and 6