Minor design flow changes

Changed where the tooltip icons show up, also reverted some changes to
the color-picker elements.