[New Layout] Adds back navigation through spaces