Changed next page functionality, still need to update them correctly