Reorder portal menu to be more consistent

Merge request reports