Closes #163 Adjusted pagination
#164 further cleanup
#164 pagination cleanup
Fixed pagination next and preious