Reorder / hide viewlets

This refs affinitic #5788