Some headers should have been public and weren't.
Handlers shouldn't be in the UI framework