Adjust UI colours for final submission.

Small refactoring of other classes.