nav bar working, few tweaks, working on dash