removed stuff / final version before removing Nav