I think the compromise will be to leave these in the header. Let's leave it this way for now. It'll get better real soon.