Enhanced base sorting
Fixed Navigation display