Improve layout in a bunch of places