Improve layout a bit