Updated templating helpers for buttons