fixed issue with image and colour swatches shifting.

Signed-off-by: Chris Jones <chris@jonezy.org>
fixed some feauture label annotations

Signed-off-by: Chris Jones <chris@jonezy.org>