Merge "Revert "Nav bar moves independently of the layer"" into main