Bug fixes and moved LoadPlaces into the activity