Re-added first/last and fixed page gap in paginator