Fix a couple of issues from merge
Fix duplicate code issue
Fix errors in code from previous screwed up version :/
Add text and new patient option to locations