added navbar, search
fixed conflict