fix semantic issues
fix nav click function and clean up code