Some style and layout fixes.