Cleaned up button template tags

ref #167
ref #171