incoporated the latest changes into dashboard, moved nav bar up to sidebar.html (master page)