Issue #9: rewrote templating for adding buttons on records page
fix merging