New Tree, Changed Locations

Changed the tree to display Calendar and Locations.
Updated the EventDetailPage for using the new locations.
Fixed some bugs