Merge pull request #166 from vishnuvv/BugFixes

Re-factoring the tooltip function for scatter chart.
Corrected the alerts template which got changed in merge conflicts