Made more changes to Prev/Next