new navbar and a few fixes