Comments going ok. Added colour changes for buttons