Fix new topbar layout with new navigator for both platforms