Added saturation and brightness picker
Minor fixes and improvements