Fixed User Controls.
Moved ColorsPopup to User Control.