Fixes some of the layout