added tabs
move map to its own activity
merge with master