Left menu working, right menu working
Merge remote-tracking branch 'origin/leftmenu-functionality' into vik/loading
Fix up menus, wire everything together