Roughly added active state for header items
Cleanup