Issue #3515777 by ivavictoria, plopesc: Reorganize Navigation menu items and make them consistent with other similar pages in core
