Fixes and cleanup for the menu to work on mobile devices mostly.