Sort some styling and layout issues.