Fixed bugs + Added Image Viewer