MapFragment finished

Finished (?) the map fragment, also readded settings button. And the spinner in the action bar now properly hides/shows as needed