Edited views,pagination,fixed javascript conflicts