Lots of layout and theming fixes.