navbar styled
Dashboard layout updated
fixing merge conflicts