Few css and layout fixes