improving layout again