navbar and more
modal fixes