Some changes to order page and list items order