Move buttons to common template