pagination and text fixes