Reorder tax disc and SORN dashboards

to match standard template