styled it up
merged
changed tooltip on navbar