Clean up numerous layout issues.