Fix some indenting issues in the buttons example
Change to new button syntax in templates