inserted logo in navbar, sidebar commented
a lot of fixes