Moved button declaration arangment to match order on screen
created templates for the buttons to go as well