#246 Fix Backstage menu
#246 Another bugfix