diff --git a/app/build.gradle b/app/build.gradle
index 7763f09..7ab592c 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    buildFeatures{
+        dataBinding true
+    }
 }
 
 dependencies {
@@ -57,8 +61,8 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
 
     //Butterknife
-    implementation 'com.jakewharton:butterknife:10.2.0'
-    kapt 'com.jakewharton:butterknife-compiler:10.2.0'
+//    implementation 'com.jakewharton:butterknife:10.2.0'
+//    kapt 'com.jakewharton:butterknife-compiler:10.2.0'
 
     //ThreeTenAPB
     implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1'
diff --git a/app/src/main/java/com/itsamirrezah/livescore/data/services/FootballDataInterceptor.kt b/app/src/main/java/com/itsamirrezah/livescore/data/services/FootballDataInterceptor.kt
index 7e125da..de489b6 100755
--- a/app/src/main/java/com/itsamirrezah/livescore/data/services/FootballDataInterceptor.kt
+++ b/app/src/main/java/com/itsamirrezah/livescore/data/services/FootballDataInterceptor.kt
@@ -9,7 +9,7 @@ class FootballDataInterceptor : Interceptor {
 
         val request = chain.request()
             .newBuilder()
-            .addHeader("X-Auth-Token", "24fb047edaa64dddb076659db5f5fd39")
+            .addHeader("X-Auth-Token", "71610fca6e1747489ffef41555f291e9")
             .build()
 
         return chain.proceed(request)
diff --git a/app/src/main/java/com/itsamirrezah/livescore/ui/activities/MainActivity.kt b/app/src/main/java/com/itsamirrezah/livescore/ui/activities/MainActivity.kt
index ff9ada2..cc69c12 100755
--- a/app/src/main/java/com/itsamirrezah/livescore/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/itsamirrezah/livescore/ui/activities/MainActivity.kt
@@ -7,17 +7,14 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
+import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import butterknife.BindView
-import butterknife.ButterKnife
-import butterknife.OnClick
+
 import com.bumptech.glide.Glide
-import com.google.android.material.bottomappbar.BottomAppBar
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipDrawable
 import com.google.android.material.chip.ChipGroup
@@ -25,6 +22,7 @@ import com.itsamirrezah.livescore.R
 import com.itsamirrezah.livescore.data.db.LivescoreDb
 import com.itsamirrezah.livescore.data.models.Team
 import com.itsamirrezah.livescore.data.services.FootbalDataApiImp
+import com.itsamirrezah.livescore.databinding.ActivityMainBinding
 import com.itsamirrezah.livescore.ui.items.*
 import com.itsamirrezah.livescore.ui.model.*
 import com.itsamirrezah.livescore.util.EndlessScrollListener
@@ -36,6 +34,7 @@ import com.mikepenz.fastadapter.GenericFastAdapter
 import com.mikepenz.fastadapter.adapters.GenericItemAdapter
 import com.mikepenz.fastadapter.adapters.ModelAdapter
 import com.mikepenz.fastadapter.ui.items.ProgressItem
+import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
@@ -45,21 +44,11 @@ import java.net.SocketTimeoutException
 
 class MainActivity : AppCompatActivity() {
 
-    //views
-    @BindView(R.id.recyclerView)
-    lateinit var recyclerView: RecyclerView
-
-    @BindView(R.id.bottomAppBar)
-    lateinit var bottomAppBar: BottomAppBar
-
-    @BindView(R.id.coordinator)
-    lateinit var coordinator: CoordinatorLayout
     lateinit var bottomSheetBehavior: BottomSheetBehavior<View>
 
-    @BindView(R.id.chipGroupCompetition)
     lateinit var chipGroupCompetition: ChipGroup
 
-    @BindView(R.id.chipGroupStatus)
+
     lateinit var chipGroupStatus: ChipGroup
 
     //data
@@ -83,8 +72,22 @@ class MainActivity : AppCompatActivity() {
      */
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        ButterKnife.bind(this)
+
+
+k
+        val binding : ActivityMainBinding = DataBindingUtil.setContentView(this,R.layout.activity_main)
+
+        binding.lifecycleOwner = this
+
+        binding.recyclerView
+        binding.bottomAppBar
+        binding.coordinator
+        binding.root
+
+        chipGroupCompetition = findViewById(R.id.chipGroupCompetition)
+        chipGroupStatus = findViewById(R.id.chipGroupStatus)
+
+        findViewById<MaterialButton>(R.id.btnFilterDone).setOnClickListener { filterDone() }
         AndroidThreeTen.init(application)
         setupSharedPreference()
         setupBottomAppBar()
@@ -98,9 +101,10 @@ class MainActivity : AppCompatActivity() {
             requestCompetitions()
             requestTeams()
         }
+
     }
 
-    @OnClick(R.id.btnFilterDone)
+//    @OnClick(R.id.btnFilterDone)
     fun filterDone() {
         val competitionsSelected = mutableSetOf<String>()
         for (i in 0 until chipGroupCompetition.childCount) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c24a5df..c5bbdd6 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,40 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
-    tools:context=".ui.activities.MainActivity">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinator"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        tools:context=".ui.activities.MainActivity">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/coordinator"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/spacing_small"
-            android:layout_marginTop="@dimen/spacing_mlarge"
-            android:layout_marginRight="@dimen/spacing_small"
-            android:layout_marginBottom="@dimen/spacing_xxlarge">
+            android:layout_height="match_parent">
 
-        </androidx.recyclerview.widget.RecyclerView>
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/spacing_small"
+                android:layout_marginTop="@dimen/spacing_mlarge"
+                android:layout_marginRight="@dimen/spacing_small"
+                android:layout_marginBottom="@dimen/spacing_xxlarge">
 
+            </androidx.recyclerview.widget.RecyclerView>
 
-        <com.google.android.material.bottomappbar.BottomAppBar
-            android:id="@+id/bottomAppBar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:backgroundTint="@color/colorPrimaryDark"
-            android:layout_gravity="bottom"
-            app:menu="@menu/bottomappbar_menu"
-            app:navigationIcon="@drawable/ic_menu_black_24dp" />
 
-        <include layout="@layout/filter_match_sheet" />
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+            <com.google.android.material.bottomappbar.BottomAppBar
+                android:id="@+id/bottomAppBar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:backgroundTint="@color/colorPrimaryDark"
+                android:layout_gravity="bottom"
+                app:menu="@menu/bottomappbar_menu"
+                app:navigationIcon="@drawable/ic_menu_black_24dp" />
+
+            <include layout="@layout/filter_match_sheet" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
-</LinearLayout>
\ No newline at end of file
+    </LinearLayout>
+</layout>
\ No newline at end of file