Fix issues #29, #30, #31. Partial fix for #23 on mobile devices. #23 still needs more work and possible a redesign of the menu. Reviewed-on: #34