Fixes to styles and layout