diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 9b5439c..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-MyCleanIndia App
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 58992cc..cfe4315 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,12 +12,7 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index cccd767..f1f87f0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "me.souravbadami.mycleanindiaapp"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
@@ -21,9 +21,12 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.google.android.gms:play-services-maps:7.8.0'
+    compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.google.android.gms:play-services-maps:8.4.0'
     compile 'com.google.android.gms:play-services-location:8.4.0'
-    compile 'com.github.arimorty:floatingsearchview:2.0.3'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.android.support:design:26.+'
+    testCompile 'junit:junit:4.12'
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 806fe9c..0672f62 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/me/souravbadami/mycleanindiaapp/MainActivity.java b/app/src/main/java/me/souravbadami/mycleanindiaapp/MainActivity.java
index 5529f24..0074805 100644
--- a/app/src/main/java/me/souravbadami/mycleanindiaapp/MainActivity.java
+++ b/app/src/main/java/me/souravbadami/mycleanindiaapp/MainActivity.java
@@ -1,13 +1,418 @@
 package me.souravbadami.mycleanindiaapp;
 
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.BitmapFactory;
+import android.location.Address;
+import android.location.Geocoder;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
 
-public class MainActivity extends AppCompatActivity {
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.Status;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.places.Place;
+import com.google.android.gms.location.places.ui.PlaceAutocompleteFragment;
+import com.google.android.gms.location.places.ui.PlaceSelectionListener;
+import com.google.android.gms.maps.CameraUpdate;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptor;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.CircleOptions;
+import com.google.android.gms.maps.model.GroundOverlayOptions;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.PolygonOptions;
 
+import java.io.IOException;
+
+import static me.souravbadami.mycleanindiaapp.R.id.map;
+
+public class MainActivity extends AppCompatActivity implements LocationListener,
+        OnMapReadyCallback,
+        GoogleMap.OnMapClickListener,
+        GoogleApiClient.ConnectionCallbacks,
+        GoogleApiClient.OnConnectionFailedListener,
+        GoogleMap.OnInfoWindowClickListener,
+        GoogleMap.OnMapLongClickListener,
+        GoogleMap.OnMarkerClickListener {
+
+    private static final String[] INITIAL_PERMS = {
+            Manifest.permission.ACCESS_FINE_LOCATION,
+            Manifest.permission.READ_CONTACTS,
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.INTERNET
+
+    };
+
+    private static final int INITIAL_REQUEST = 1337;
+    private static final int LOCATION_REQUEST = INITIAL_REQUEST + 1;
+
+    private final int[] MAP_TYPES = {GoogleMap.MAP_TYPE_NORMAL,
+            GoogleMap.MAP_TYPE_SATELLITE,
+            GoogleMap.MAP_TYPE_HYBRID,
+            GoogleMap.MAP_TYPE_TERRAIN,
+            GoogleMap.MAP_TYPE_NONE};
+    private int curMapTypeIndex = 0;
+
+    // flag for GPS status
+    boolean isGPSEnabled = false;
+    // flag for network status
+    boolean isNetworkEnabled = false;
+
+    private GoogleMap mMap;
+    private LocationManager locationManager = null;
+    private GoogleApiClient mGoogleApiClient = null;
+    private PlaceAutocompleteFragment placeAutocompleteFragment = null;
+    private SupportMapFragment mapFragment = null;
+    private Location mCurrentLocation;
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        // Request access to location
+        if (!canAccessLocation()) {
+            requestPermissions(INITIAL_PERMS, INITIAL_REQUEST);
+        }
+
+        mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(map);
+        mapFragment.getMapAsync(this);
+
+
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        switch (requestCode) {
+            case LOCATION_REQUEST:
+                if (canAccessLocation()) {
+                    Toast.makeText(this, "Location activated", Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(this, "An error has ocurred", Toast.LENGTH_SHORT).show();
+                }
+                break;
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private boolean canAccessLocation() {
+        return (hasPermission(Manifest.permission.ACCESS_FINE_LOCATION));
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private boolean hasPermission(String perm) {
+        return (PackageManager.PERMISSION_GRANTED == checkSelfPermission(perm));
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+    }
+
+    @Override
+    public void onStatusChanged(String s, int i, Bundle bundle) {
+    }
+
+    @Override
+    public void onProviderEnabled(String s) {
+    }
+
+    @Override
+    public void onProviderDisabled(String s) {
+    }
+
+    @Override
+    public void onMapLongClick(LatLng latLng) {
+        MarkerOptions options = new MarkerOptions().position( latLng );
+        //options.title( getAddressFromLatLng(latLng) );
+        options.icon( BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_BLUE) );
+        mMap.addMarker(options);
+    }
+
+    @Override
+    public void onMapClick(LatLng latLng) {
+        MarkerOptions options = new MarkerOptions().position( latLng );
+        //options.title( getAddressFromLatLng( latLng ) );
+        options.icon( BitmapDescriptorFactory.defaultMarker() );
+        mMap.addMarker( options );
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (mGoogleApiClient != null) {
+            mGoogleApiClient.connect();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mGoogleApiClient != null && mGoogleApiClient.isConnected()) {
+            mGoogleApiClient.disconnect();
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
+                ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
+
+        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+        // getting GPS status
+        isGPSEnabled = locationManager
+                .isProviderEnabled(LocationManager.GPS_PROVIDER);
+
+        // getting network status
+        isNetworkEnabled = locationManager
+                .isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+
+        Location location = null;
+        // if GPS Enabled get lat/long using GPS Services
+
+        if (isNetworkEnabled) {
+            if (location == null) {
+
+                locationManager.requestLocationUpdates(
+                        LocationManager.NETWORK_PROVIDER,
+                        2000,
+                        10, this);
+
+                if (locationManager != null) {
+                    location = locationManager
+                            .getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+                    if (location != null) {
+                        googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), 14));
+                    }
+                }
+            }
+        }
+
+        if (isGPSEnabled) {
+            if (location == null) {
+
+                locationManager.requestLocationUpdates(
+                        LocationManager.GPS_PROVIDER,
+                        2000,
+                        10, this);
+
+
+                if (locationManager != null) {
+                    location = locationManager
+                            .getLastKnownLocation(LocationManager.GPS_PROVIDER);
+                    if (location != null) {
+                        googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(location.getLatitude(), location.getLongitude()), 14));
+                    }
+                }
+            }
+        }
+
+        googleMap.setMapType(MAP_TYPES[curMapTypeIndex]);
+        googleMap.setMyLocationEnabled(true);
+        googleMap.setTrafficEnabled(false);
+        googleMap.setOnMapClickListener(this);
+        googleMap.getUiSettings().setZoomControlsEnabled(true);
+
+        mMap = googleMap;
+
+        // Allow user to search for the destination place
+        placeAutocompleteFragment = (PlaceAutocompleteFragment)
+                getFragmentManager().findFragmentById(R.id.place_autocomplete_fragment);
+
+        placeAutocompleteFragment.setOnPlaceSelectedListener(new PlaceSelectionListener() {
+            @Override
+            public void onPlaceSelected(Place place) {
+                // TODO: obter informações sobre o local selecionado.
+                Log.i("Place Destination", "Place: " + place.getName());
+
+                LatLng latLng = place.getLatLng();
+
+                // Creating MarkerOptions
+                MarkerOptions options = new MarkerOptions();
+
+                // Setting the position of the marker
+                options.position(place.getLatLng());
+                options.title(place.getName().toString());
+                options.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED));
+                CameraUpdate cameraUpdate = CameraUpdateFactory.newLatLngZoom(new LatLng(latLng.latitude, latLng.longitude), 13);
+
+                mMap.addMarker(options);
+                mMap.animateCamera(cameraUpdate);
+            }
+
+            @Override
+            public void onError(Status status) {
+                // TODO: Solucionar o erro.
+                Log.i("Place Destination", "Ocorreu um erro: " + status);
+            }
+        });
+
+    }
+
+    @Override
+    public void onConnected(@Nullable Bundle bundle) {
+
+    }
+
+    @Override
+    public void onConnectionSuspended(int i) {
+
+    }
+
+    @Override
+    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+        //Create a default location if the Google API Client fails. Placing location at Googleplex
+        Location mCurrentLocation = new Location("");
+        mCurrentLocation.setLatitude( 28.6149 );
+        mCurrentLocation.setLongitude( 77.2090 );
+        initCamera(mCurrentLocation);
+    }
+
+    @Override
+    public void onInfoWindowClick(Marker marker) {
+        Toast.makeText( this, "Clicked on marker", Toast.LENGTH_SHORT ).show();
+    }
+
+    @Override
+    public boolean onMarkerClick(Marker marker) {
+        marker.showInfoWindow();
+        return false;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_clear: {
+                //getMap().clear();
+                return true;
+            }
+            case R.id.action_circle: {
+                drawCircle( new LatLng( mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude() ) );
+                return true;
+            }
+            case R.id.action_polygon: {
+                drawPolygon( new LatLng( mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude() ) );
+                return true;
+            }
+            case R.id.action_overlay: {
+                drawOverlay( new LatLng( mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude() ), 250, 250 );
+                return true;
+            }
+            case R.id.action_traffic: {
+                toggleTraffic();
+                return true;
+            }
+            case R.id.action_cycle_map_type: {
+                cycleMapType();
+                return true;
+            }
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void initCamera(Location location) {
+        CameraPosition position = CameraPosition.builder()
+                .target(new LatLng(location.getLatitude(), location.getLongitude()))
+                .zoom(4.3f)
+                .bearing(0.0f)
+                .tilt(0.0f)
+                .build();
+
+        mMap.animateCamera(CameraUpdateFactory.newCameraPosition(position), null);
+
+        mMap.setMapType(MAP_TYPES[curMapTypeIndex]);
+        mMap.setTrafficEnabled(true);
+        mMap.getUiSettings().setZoomControlsEnabled(true);
+    }
+
+    private String getAddressFromLatLng( LatLng latLng ) {
+        Geocoder geocoder = new Geocoder( this );
+
+        String address = "";
+        try {
+            address = geocoder.getFromLocation( latLng.latitude, latLng.longitude, 1 ).get( 0 ).getAddressLine( 0 );
+        } catch (IOException e ) {
+        }
+
+        return address;
+    }
+
+    private void drawCircle( LatLng location ) {
+        CircleOptions options = new CircleOptions();
+        options.center( location );
+        //Radius in meters
+        options.radius( 10 );
+        options.fillColor( getResources().getColor( R.color.fill_color ) );
+        options.strokeColor( getResources().getColor( R.color.stroke_color ) );
+        options.strokeWidth( 10 );
+        //getMap().addCircle(options);
+    }
+
+    private void drawPolygon( LatLng startingLocation ) {
+        LatLng point2 = new LatLng( startingLocation.latitude + .001, startingLocation.longitude );
+        LatLng point3 = new LatLng( startingLocation.latitude, startingLocation.longitude + .001 );
+
+        PolygonOptions options = new PolygonOptions();
+        options.add(startingLocation, point2, point3);
+
+        options.fillColor( getResources().getColor( R.color.fill_color ) );
+        options.strokeColor( getResources().getColor( R.color.stroke_color ) );
+        options.strokeWidth( 10 );
+
+        //getMap().addPolygon(options);
+    }
+
+    private void drawOverlay( LatLng location, int width, int height ) {
+        GroundOverlayOptions options = new GroundOverlayOptions();
+        options.position(location, width, height);
+
+        options.image( BitmapDescriptorFactory
+                .fromBitmap( BitmapFactory
+                        .decodeResource( getResources(), R.mipmap.ic_launcher ) ) );
+        //getMap().addGroundOverlay(options);
+    }
+
+    private void toggleTraffic() {
+        mMap.setTrafficEnabled( !mMap.isTrafficEnabled() );
+    }
+
+    private void cycleMapType() {
+        if( curMapTypeIndex < MAP_TYPES.length - 1 ) {
+            curMapTypeIndex++;
+        } else {
+            curMapTypeIndex = 0;
+        }
+
+        //getMap().setMapType( MAP_TYPES[curMapTypeIndex] );
     }
 }
+
diff --git a/app/src/main/java/me/souravbadami/mycleanindiaapp/MapFragment.java b/app/src/main/java/me/souravbadami/mycleanindiaapp/MapFragment.java
deleted file mode 100644
index 1058862..0000000
--- a/app/src/main/java/me/souravbadami/mycleanindiaapp/MapFragment.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package me.souravbadami.mycleanindiaapp;
-
-import android.graphics.BitmapFactory;
-import android.location.Geocoder;
-import android.location.Location;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-import com.google.android.gms.maps.model.CameraPosition;
-import com.google.android.gms.maps.model.CircleOptions;
-import com.google.android.gms.maps.model.GroundOverlayOptions;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.MarkerOptions;
-import com.google.android.gms.maps.model.PolygonOptions;
-
-import java.io.IOException;
-
-public class MapFragment extends SupportMapFragment implements GoogleApiClient.ConnectionCallbacks,
-        GoogleApiClient.OnConnectionFailedListener,
-        GoogleMap.OnInfoWindowClickListener,
-        GoogleMap.OnMapLongClickListener,
-        GoogleMap.OnMapClickListener,
-        GoogleMap.OnMarkerClickListener {
-
-    private GoogleApiClient mGoogleApiClient;
-    private Location mCurrentLocation;
-
-    private final int[] MAP_TYPES = { GoogleMap.MAP_TYPE_NORMAL,
-            GoogleMap.MAP_TYPE_SATELLITE,
-            GoogleMap.MAP_TYPE_HYBRID,
-            GoogleMap.MAP_TYPE_TERRAIN,
-            GoogleMap.MAP_TYPE_NONE };
-    private int curMapTypeIndex = 0;
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        setHasOptionsMenu(true);
-
-        mGoogleApiClient = new GoogleApiClient.Builder( getActivity() )
-                .addConnectionCallbacks( this )
-                .addOnConnectionFailedListener( this )
-                .addApi( LocationServices.API )
-                .build();
-
-        initListeners();
-    }
-
-    private void initListeners() {
-        getMap().setOnMarkerClickListener(this);
-        getMap().setOnMapLongClickListener(this);
-        getMap().setOnInfoWindowClickListener( this );
-        getMap().setOnMapClickListener(this);
-        getMap().setPadding(0,80,0,0);
-    }
-
-    private void removeListeners() {
-        if( getMap() != null ) {
-            getMap().setOnMarkerClickListener( null );
-            getMap().setOnMapLongClickListener(null);
-            getMap().setOnInfoWindowClickListener(null);
-            getMap().setOnMapClickListener(null);
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        removeListeners();
-    }
-
-    private void initCamera( Location location ) {
-        CameraPosition position = CameraPosition.builder()
-                .target( new LatLng( location.getLatitude(), location.getLongitude() ) )
-                .zoom( 4.3f )
-                .bearing( 0.0f )
-                .tilt( 0.0f )
-                .build();
-
-        getMap().animateCamera( CameraUpdateFactory.newCameraPosition( position ), null );
-
-        getMap().setMapType( MAP_TYPES[curMapTypeIndex] );
-        getMap().setTrafficEnabled( true );
-        getMap().setMyLocationEnabled( true );
-        getMap().getUiSettings().setZoomControlsEnabled( true );
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        if(mGoogleApiClient != null) {
-            mGoogleApiClient.connect();
-        }
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if( mGoogleApiClient != null && mGoogleApiClient.isConnected() ) {
-            mGoogleApiClient.disconnect();
-        }
-    }
-
-    @Override
-    public void onConnected(Bundle bundle) {
-        mCurrentLocation = LocationServices.FusedLocationApi.getLastLocation( mGoogleApiClient );
-        if(mCurrentLocation != null) {
-            initCamera(mCurrentLocation);
-        } else {
-            mCurrentLocation = new Location( "" );
-            mCurrentLocation.setLatitude( 22.9734 );
-            mCurrentLocation.setLongitude( 80.6569 );
-            initCamera(mCurrentLocation);
-        }
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        //handle play services disconnecting if location is being constantly used
-    }
-
-    @Override
-    public void onConnectionFailed(ConnectionResult connectionResult) {
-        //Create a default location if the Google API Client fails. Placing location at Googleplex
-        mCurrentLocation = new Location( "" );
-        mCurrentLocation.setLatitude( 28.6149 );
-        mCurrentLocation.setLongitude( 77.2090 );
-        initCamera(mCurrentLocation);
-    }
-
-    @Override
-    public void onInfoWindowClick(Marker marker) {
-        Toast.makeText( getActivity(), "Clicked on marker", Toast.LENGTH_SHORT ).show();
-    }
-
-    @Override
-    public boolean onMarkerClick(Marker marker) {
-        marker.showInfoWindow();
-        return true;
-    }
-
-    @Override
-    public void onMapClick(LatLng latLng) {
-
-        MarkerOptions options = new MarkerOptions().position( latLng );
-        options.title( getAddressFromLatLng( latLng ) );
-
-        options.icon( BitmapDescriptorFactory.defaultMarker( ) );
-        getMap().addMarker( options );
-    }
-
-    @Override
-    public void onMapLongClick(LatLng latLng) {
-        MarkerOptions options = new MarkerOptions().position( latLng );
-        options.title( getAddressFromLatLng(latLng) );
-
-        options.icon( BitmapDescriptorFactory.fromBitmap(
-                BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher ) ) );
-
-        getMap().addMarker(options);
-    }
-
-    private String getAddressFromLatLng( LatLng latLng ) {
-        Geocoder geocoder = new Geocoder( getActivity() );
-
-        String address = "";
-        try {
-            address = geocoder.getFromLocation( latLng.latitude, latLng.longitude, 1 ).get( 0 ).getAddressLine( 0 );
-        } catch (IOException e ) {
-        }
-
-        return address;
-    }
-
-    private void drawCircle( LatLng location ) {
-        CircleOptions options = new CircleOptions();
-        options.center( location );
-        //Radius in meters
-        options.radius( 10 );
-        options.fillColor( getResources().getColor( R.color.fill_color ) );
-        options.strokeColor( getResources().getColor( R.color.stroke_color ) );
-        options.strokeWidth( 10 );
-        getMap().addCircle(options);
-    }
-
-    private void drawPolygon( LatLng startingLocation ) {
-        LatLng point2 = new LatLng( startingLocation.latitude + .001, startingLocation.longitude );
-        LatLng point3 = new LatLng( startingLocation.latitude, startingLocation.longitude + .001 );
-
-        PolygonOptions options = new PolygonOptions();
-        options.add(startingLocation, point2, point3);
-
-        options.fillColor( getResources().getColor( R.color.fill_color ) );
-        options.strokeColor( getResources().getColor( R.color.stroke_color ) );
-        options.strokeWidth( 10 );
-
-        getMap().addPolygon(options);
-    }
-
-    private void drawOverlay( LatLng location, int width, int height ) {
-        GroundOverlayOptions options = new GroundOverlayOptions();
-        options.position(location, width, height);
-
-        options.image( BitmapDescriptorFactory
-                .fromBitmap( BitmapFactory
-                        .decodeResource( getResources(), R.mipmap.ic_launcher ) ) );
-        getMap().addGroundOverlay(options);
-    }
-
-    private void toggleTraffic() {
-        getMap().setTrafficEnabled( !getMap().isTrafficEnabled() );
-    }
-
-    private void cycleMapType() {
-        if( curMapTypeIndex < MAP_TYPES.length - 1 ) {
-            curMapTypeIndex++;
-        } else {
-            curMapTypeIndex = 0;
-        }
-
-        getMap().setMapType( MAP_TYPES[curMapTypeIndex] );
-    }
-
-    @Override
-    public void onCreateOptionsMenu(
-            Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_main, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_clear: {
-                getMap().clear();
-                return true;
-            }
-            case R.id.action_circle: {
-                drawCircle( new LatLng( mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude() ) );
-                return true;
-            }
-            case R.id.action_polygon: {
-                drawPolygon( new LatLng( mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude() ) );
-                return true;
-            }
-            case R.id.action_overlay: {
-                drawOverlay( new LatLng( mCurrentLocation.getLatitude(), mCurrentLocation.getLongitude() ), 250, 250 );
-                return true;
-            }
-            case R.id.action_traffic: {
-                toggleTraffic();
-                return true;
-            }
-            case R.id.action_cycle_map_type: {
-                cycleMapType();
-                return true;
-            }
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml
new file mode 100644
index 0000000..4bed208
--- /dev/null
+++ b/app/src/main/res/drawable/border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="5dp" />
+
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8545d8a..4d38c2a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,33 +3,36 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingBottom="0dp"
-    android:paddingLeft="0dp"
-    android:paddingRight="0dp"
-    android:paddingTop="0dp"
+
     tools:context="me.souravbadami.mycleanindiaapp.MainActivity">
 
     <fragment
+        android:translationZ="0dp"
         android:id="@+id/map"
-        android:name="me.souravbadami.mycleanindiaapp.MapFragment"
+        android:name="com.google.android.gms.maps.SupportMapFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true" />
+        tools:context=".MainActivity" />
 
-    <com.arlib.floatingsearchview.FloatingSearchView
-        android:id="@+id/floating_search_view"
+    <RelativeLayout
+        android:background="@drawable/border"
+        android:translationZ="1dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:floatingSearch_searchBarMarginLeft="9dp"
-        app:floatingSearch_searchBarMarginTop="2dp"
-        app:floatingSearch_searchBarMarginRight="9dp"
-        app:floatingSearch_searchHint="Search for a place..."
-        app:floatingSearch_suggestionsListAnimDuration="250"
-        app:floatingSearch_showSearchKey="false"
-        app:floatingSearch_leftActionMode="noLeftAction"
-        app:floatingSearch_close_search_on_keyboard_dismiss="true" />
+        android:layout_height="45dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:orientation="horizontal">
+
+        <fragment
+            android:layout_gravity="center"
+            android:id="@+id/place_autocomplete_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:name="com.google.android.gms.location.places.ui.PlaceAutocompleteFragment"
+            />
+
+    </RelativeLayout>
+
 
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
index 03bced9..c2eea8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 122a0dc..be23bd8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Fri Oct 20 07:12:23 BRST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip