Minor refactoring.    Removing unneeded borders.   Adding preview image.