Added tooltips in navbar
Merge branch 'staging'