Added classes to active menu items + presentation fixes