Added active state and fixed header