(WIP) Refactor menu

Move menu entry responsibilities into main