Surgery Popup changes got overwritten

Resubmitting changes made yesterday
Merge pull request #6 from RoyWenman/master

Surgery Popup changes got overwritten