shrinking the time view when options present. and some clean up.
color swatch button now derives from button.