Fix bug in selection function
Change to object-based menu
Add new Menu class

New menu class allows for easier creation and manipulation of the
different menu entries.