Some major UI changes to menus
Merge branch
Merge branch