Updating the menu and splitting the order screen onto two lines. Fixes #16