More UI Fixes:
- Moved top level menu items to actual top menu
- Cleaned up blade headers