Added unique ids and fixed all urls/handlers appropriately
Merge pull request #2 from ClintLiddick/Mark's-Bug-Fixing-Branch

Added unique ids and fixed all urls/handlers appropriately