Navigation brought in line with current design.