more work on location and events display