many styling and layout fixes