Added unique ids and fixed all urls/handlers appropriately