fix problems and simplify nav menu