new nav bar, more fixes updates