Modified some layout constraints to look as expected on 3.5 inch devices as well.