Added some functionality and cleaned up how the menus are drawn