improvements to pagination. also removed unused components