Lots of refactoring - made everything a little more consistent
Modify search function to change url on form submission
Set urls in map object, use them directly in webpage rather than baking them there