large refactoring and added styling for current menu item