Issue 24 - Re-factored code to streamline setting active menu items.