Removed all buttons from markup as these are now generated in JS
(WIP) - refactor JS functions to be nested rather than sequential, add more event handlers for buttons, clean up code