Adjusted layout again