Map view finally working! Some more minor changes as well.