-- new menu: mark selected main menu item, cleaning up logic related to that
-- new menu: fixed issue w/ menu select My Settings & Admin
- beautified
- beautified
- beautified
- beautified
- beautified
- beautified
- fixed merge conflict
-- Main menu "My Settings" linked users profile page