fixed navbar
merge prob
added navbar back