Improve header classes