minor code changes

working on color toggle feature.