Bug Fixes and Minor Tidyup

This latest version includes a minor project tidy up and fixes a bug where a clicked button had an outline artefact that would remain until another button was clicked.