Further optimisations to the Navigation building