Styling and minor fixes.