Refactoring out of root scope and into the components.  Adding active menu state