Bug #12: Move the menu to the bottom and refactor