Reorganized into a master view with child views. Still working on bringing back the Google map.