Merge pull request #867 from brooksryba/develop

Develop
modal success
Merge pull request #868 from Tendrid/develop

modal success
Added hacky stuff to tooltip