Added navbar and squashed tooltip bugs