Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
It is not duplicated because the set up for the coloring when you load the scene is different to the one when you press the 'Next' button. I removed all the commented code that was not being used.