Set template for Button Text

Remove requirement for additional Row.