style and layout fixes