Tidied up the templates and added a .buttons layer around the buttons.
Took out the dropdown for the moment, will look to add this later.