refactor and clean up code, add map fragment, add full map activity
merge