remove  from compile
build dist
some tidy up
small tidy up
Merge branch 'master' into 8-in-situ-panel
move button generators to TemplateUtils