Styling related fixes.