Improve layout (again)