Remove pagination
Add page links conditional
Change valid order for pagination validation