Bug refs #1402: not fixed (workaround)
Bug refs #1402: refactoring (clean markup, move buttons to separate directive to decrease boilerplate)