[Upg] move custom navigation to the right of main navigation