Update to UI

Consolidate menus and move functions that are better suited for menus.