Agreed. The header is just packed with stuff already so it'd be a pretty big overhaul