more offscreen, cleanup
Merge branch 'fancy-sandbox' of github.com:punkave/apostrophe-sandbox into fancy-sandbox