Applied naming conventions & added code to ThumbnailViewer