Update nav for expand/collapse items and active states
Added active nav styling