Adding image viewing capabilities, conditional views