adjusted layout again