updated to reflect new design
better applying of active and inactive styles