Various style and layout fixes