Added filters, ordering, button states