Remove buttons on template level, add them back with js - fixes #8082
Merge branch 'dev' into test