Some name changes
Added Google Map fragment