Bugs fixed and optimized options on the second nav.