Add active state to menu and change some wording