page nimbers nav and current nav fixes