css and layout cleanup