Fix tool tips and edit modal
Merge pull request #2 from omockler/master

Fix tool tips and edit modal