Improve layout in preparation for modal