fix layout
ugh
finish sqp painting and swatches