Changes position of buttonson templates
Merge pull request #17 from Ayyzee/cleanup

Changes position of buttonson templates