Make a bunch of fixes in the layout and design