Updates to RubiksCube, Main and CPaintList