Improve layout again