Controller handling revised
Removed border from ImageViewer