Lots of tweaks to the default layout.