don't need to track the workspace
move the dialog above everything else on a page
Merge branch 'master' into gh-pages