General Update 06

1) Added image swatches
2) Bug fixes