Cleanup
Clean up
Reallign colors
Fix header