Stackoverflow error corrected

Found the error. A cyclical statement in map_view_activity.xml. Going to
commit then revert to one of the commits further ahead than the revert
this is based on. Hopefully make back all the work I've done.