Final tweak to layout, fix some CSS issues