Added image viewer and paginat