updated nav class managemtn
merged conflict