fix nav and include mask