Adjusted layout for a better fit