in progress.. fixing active item highlight