Frontend: Fixing #152; context menu can be offscreen
Merge branch 'master' into metro