Minor style and layout fixes