Removed redundant files && image pagination

and other fixes/changes