Refactor filters, arrange dash