Small changes to make nav work