Code refactor and added wp_nav_menu

Code refactor and added wp_nav_menu