Tightening up css and layout