Moved color partial into form field to display it better.

Stretched out color picker boxes.
Minor movement adjustments to align.