Updated XMLs, added a MapActivity and cleaned up code