Revert 4b877f7..fd37b62

This rolls back to commit 4b877f71294e8ca40299b0a9c752658d8c10483e.
huge header/splash fix.