Merge pull request #97 from datamade/master

current nav item, resources tooltip