diff --git a/build.gradle b/build.gradle
index c23cc5415..a6f842479 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     ext {
         kotlinVersion = '1.3.61'
-        androidGradleVersion = '3.5.3'
+        androidGradleVersion = '3.6.0'
 
         // Google libraries
         appCompatVersion = '1.1.0'
         constraintLayoutVersion = '1.1.3'
-        materialComponentsVersion = '1.1.0-rc02'
+        materialComponentsVersion = '1.1.0'
         roomVersion = '2.2.3'
         lifecycleVersion = '2.2.0'
 
diff --git a/gradle.properties b/gradle.properties
index b5e75b03b..5f446eda8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,8 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 
+android.useAndroidX=true
+
 VERSION_NAME=3.1.2
 # 3*100*100 + 1*100 + 2 => 30102
 VERSION_CODE=30102
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index c37e83aa2..23747160c 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -8,9 +8,11 @@
             android:launchMode="singleTask"
             android:taskAffinity="com.chuckerteam.chucker.task"
             android:theme="@style/Chucker.Theme" />
+
         <activity android:name="com.chuckerteam.chucker.internal.ui.transaction.TransactionActivity"
             android:theme="@style/Chucker.Theme"
             android:parentActivityName="com.chuckerteam.chucker.internal.ui.MainActivity"/>
+
         <activity android:name="com.chuckerteam.chucker.internal.ui.error.ErrorActivity"
             android:theme="@style/Chucker.Theme"
             android:parentActivityName="com.chuckerteam.chucker.internal.ui.MainActivity" />
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt
index b85345213..42ab63be6 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/MainActivity.kt
@@ -28,16 +28,16 @@ internal class MainActivity :
         super.onCreate(savedInstanceState)
         setContentView(R.layout.chucker_activity_main)
 
-        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        val toolbar = findViewById<Toolbar>(R.id.chuckerTransactionToolbar)
         setSupportActionBar(toolbar)
         toolbar.subtitle = applicationName
 
         viewModel = ViewModelProvider(this).get(MainViewModel::class.java)
 
-        viewPager = findViewById(R.id.viewPager)
+        viewPager = findViewById(R.id.chuckerMainViewPager)
         viewPager.adapter = HomePageAdapter(this, supportFragmentManager)
 
-        val tabLayout = findViewById<TabLayout>(R.id.tabLayout)
+        val tabLayout = findViewById<TabLayout>(R.id.chuckerMainTabLayout)
         tabLayout.setupWithViewPager(viewPager)
 
         viewPager.addOnPageChangeListener(object : TabLayout.TabLayoutOnPageChangeListener(tabLayout) {
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt
index 0f87836e2..bffd62fea 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorActivity.kt
@@ -30,15 +30,15 @@ internal class ErrorActivity : BaseChuckerActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.chucker_activity_error)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(findViewById(R.id.chuckerErrorToolbar))
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        title = findViewById(R.id.toolbar_title)
-        tag = findViewById(R.id.tag)
-        clazz = findViewById(R.id.clazz)
-        message = findViewById(R.id.message)
-        date = findViewById(R.id.date)
-        stacktrace = findViewById(R.id.stacktrace)
+        title = findViewById(R.id.chuckerErrorToolbarTitle)
+        tag = findViewById(R.id.chuckerItemErrorTag)
+        clazz = findViewById(R.id.chuckerItemErrorClazz)
+        message = findViewById(R.id.chuckerItemErrorMessage)
+        date = findViewById(R.id.chuckerItemErrorDate)
+        stacktrace = findViewById(R.id.chuckerErrorStacktrace)
         date.visibility = View.GONE
 
         throwableId = intent.getLongExtra(EXTRA_THROWABLE_ID, 0)
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorAdapter.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorAdapter.kt
index 4b4c1ed6a..330683f03 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorAdapter.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorAdapter.kt
@@ -40,10 +40,10 @@ internal class ErrorAdapter(
         itemView: View
     ) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
-        private val tagView: TextView = itemView.findViewById(R.id.tag)
-        private val clazzView: TextView = itemView.findViewById(R.id.clazz)
-        private val messageView: TextView = itemView.findViewById(R.id.message)
-        private val dateView: TextView = itemView.findViewById(R.id.date)
+        private val tagView: TextView = itemView.findViewById(R.id.chuckerItemErrorTag)
+        private val clazzView: TextView = itemView.findViewById(R.id.chuckerItemErrorClazz)
+        private val messageView: TextView = itemView.findViewById(R.id.chuckerItemErrorMessage)
+        private val dateView: TextView = itemView.findViewById(R.id.chuckerItemErrorDate)
         private var throwableId: Long? = null
 
         init {
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorListFragment.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorListFragment.kt
index a7fd06e42..469895a6c 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorListFragment.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/error/ErrorListFragment.kt
@@ -35,10 +35,10 @@ internal class ErrorListFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.chucker_fragment_error_list, container, false).apply {
-            tutorialView = findViewById(R.id.tutorial)
-            findViewById<TextView>(R.id.link).movementMethod = LinkMovementMethod.getInstance()
+            tutorialView = findViewById(R.id.chuckerErrorsTutorialView)
+            findViewById<TextView>(R.id.chuckerErrorsTutorialLink).movementMethod = LinkMovementMethod.getInstance()
 
-            val recyclerView = findViewById<RecyclerView>(R.id.list)
+            val recyclerView = findViewById<RecyclerView>(R.id.chuckerErrorsRecyclerView)
             recyclerView.addItemDecoration(DividerItemDecoration(context, VERTICAL))
             adapter = ErrorAdapter(listener)
             recyclerView.adapter = adapter
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt
index a8cb99c45..743d351e1 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionActivity.kt
@@ -33,15 +33,15 @@ internal class TransactionActivity : BaseChuckerActivity() {
         viewModel = ViewModelProvider(this, TransactionViewModelFactory(transactionId))
             .get(TransactionViewModel::class.java)
 
-        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        val toolbar = findViewById<Toolbar>(R.id.chuckerTransactionToolbar)
         setSupportActionBar(toolbar)
-        title = findViewById(R.id.toolbar_title)
+        title = findViewById(R.id.chuckerTransactionToolbarTitle)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        findViewById<ViewPager>(R.id.viewpager)?.let { viewPager ->
+        findViewById<ViewPager>(R.id.chuckerTransactionViewPager)?.let { viewPager ->
             setupViewPager(viewPager)
-            findViewById<TabLayout>(R.id.tabs).setupWithViewPager(viewPager)
+            findViewById<TabLayout>(R.id.chuckerTransactionTabLayout).setupWithViewPager(viewPager)
         }
     }
 
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionAdapter.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionAdapter.kt
index 79cf7d160..b1ca3db33 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionAdapter.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionAdapter.kt
@@ -46,13 +46,13 @@ internal class TransactionAdapter internal constructor(
     }
 
     inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
-        private val code: TextView = view.findViewById(R.id.code)
-        private val path: TextView = view.findViewById(R.id.path)
-        private val host: TextView = view.findViewById(R.id.host)
-        private val start: TextView = view.findViewById(R.id.time_start)
-        private val duration: TextView = view.findViewById(R.id.duration)
-        private val size: TextView = view.findViewById(R.id.size)
-        private val ssl: ImageView = view.findViewById(R.id.ssl)
+        private val code: TextView = view.findViewById(R.id.chuckerTransactionItemCode)
+        private val path: TextView = view.findViewById(R.id.chuckerTransactionItemPath)
+        private val host: TextView = view.findViewById(R.id.chuckerTransactionItemHost)
+        private val start: TextView = view.findViewById(R.id.chuckerTransactionItemTimeStart)
+        private val duration: TextView = view.findViewById(R.id.chuckerTransactionItemDuration)
+        private val size: TextView = view.findViewById(R.id.chuckerTransactionItemSize)
+        private val ssl: ImageView = view.findViewById(R.id.chuckerTransactionItemSsl)
 
         @SuppressLint("SetTextI18n")
         fun bind(transaction: HttpTransactionTuple) {
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionListFragment.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionListFragment.kt
index 5d455cd47..2ef349b16 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionListFragment.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionListFragment.kt
@@ -40,10 +40,10 @@ internal class TransactionListFragment :
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.chucker_fragment_transaction_list, container, false)
-        tutorialView = view.findViewById(R.id.tutorial)
-        view.findViewById<TextView>(R.id.link).movementMethod = LinkMovementMethod.getInstance()
+        tutorialView = view.findViewById(R.id.chuckerTransactionsTutorialView)
+        view.findViewById<TextView>(R.id.chuckerTransactionsLink).movementMethod = LinkMovementMethod.getInstance()
 
-        val recyclerView = view.findViewById<RecyclerView>(R.id.list)
+        val recyclerView = view.findViewById<RecyclerView>(R.id.chuckerTransactionsRecyclerView)
         val context = view.context
         recyclerView.addItemDecoration(
             DividerItemDecoration(context, DividerItemDecoration.VERTICAL)
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionOverviewFragment.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionOverviewFragment.kt
index 1fc6039f9..f678689a6 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionOverviewFragment.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionOverviewFragment.kt
@@ -41,18 +41,18 @@ internal class TransactionOverviewFragment : Fragment() {
     ): View? =
         inflater.inflate(R.layout.chucker_fragment_transaction_overview, container, false)
             .also {
-                url = it.findViewById(R.id.url)
-                method = it.findViewById(R.id.method)
-                protocol = it.findViewById(R.id.protocol)
-                status = it.findViewById(R.id.status)
-                response = it.findViewById(R.id.response)
-                ssl = it.findViewById(R.id.ssl)
-                requestTime = it.findViewById(R.id.request_time)
-                responseTime = it.findViewById(R.id.response_time)
-                duration = it.findViewById(R.id.duration)
-                requestSize = it.findViewById(R.id.request_size)
-                responseSize = it.findViewById(R.id.response_size)
-                totalSize = it.findViewById(R.id.total_size)
+                url = it.findViewById(R.id.chuckerTransactionOverviewUrl)
+                method = it.findViewById(R.id.chuckerTransactionOverviewMethod)
+                protocol = it.findViewById(R.id.chuckerTransactionOverviewProtocol)
+                status = it.findViewById(R.id.chuckerTransactionOverviewStatus)
+                response = it.findViewById(R.id.chuckerTransactionOverviewResponse)
+                ssl = it.findViewById(R.id.chuckerTransactionOverviewSsl)
+                requestTime = it.findViewById(R.id.chuckerTransactionOverviewRequestTime)
+                responseTime = it.findViewById(R.id.chuckerTransactionOverviewResponseTime)
+                duration = it.findViewById(R.id.chuckerTransactionOverviewDuration)
+                requestSize = it.findViewById(R.id.chuckerTransactionOverviewRequestSize)
+                responseSize = it.findViewById(R.id.chuckerTransactionOverviewResponseSize)
+                totalSize = it.findViewById(R.id.chuckerTransactionOverviewTotalSize)
             }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadAdapter.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadAdapter.kt
index bfbefe095..8b8698b48 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadAdapter.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadAdapter.kt
@@ -96,7 +96,7 @@ internal sealed class TransactionPayloadViewHolder(view: View) : RecyclerView.Vi
     abstract fun bind(item: TransactionPayloadItem)
 
     internal class HeaderViewHolder(view: View) : TransactionPayloadViewHolder(view) {
-        private val headersView: TextView = view.findViewById(R.id.headers)
+        private val headersView: TextView = view.findViewById(R.id.chuckerTransactionResponseHeaders)
         override fun bind(item: TransactionPayloadItem) {
             if (item is TransactionPayloadItem.HeaderItem) {
                 headersView.text = item.headers
@@ -105,7 +105,7 @@ internal sealed class TransactionPayloadViewHolder(view: View) : RecyclerView.Vi
     }
 
     internal class BodyLineViewHolder(view: View) : TransactionPayloadViewHolder(view) {
-        private val bodyLineView: TextView = view.findViewById(R.id.body_line)
+        private val bodyLineView: TextView = view.findViewById(R.id.chuckerTransactionResponseBodyLine)
         override fun bind(item: TransactionPayloadItem) {
             if (item is TransactionPayloadItem.BodyLineItem) {
                 bodyLineView.text = item.line
@@ -114,7 +114,7 @@ internal sealed class TransactionPayloadViewHolder(view: View) : RecyclerView.Vi
     }
 
     internal class ImageViewHolder(view: View) : TransactionPayloadViewHolder(view) {
-        private val binaryDataView: ImageView = view.findViewById(R.id.binary_data)
+        private val binaryDataView: ImageView = view.findViewById(R.id.chuckerTransactionResponseBinaryData)
         override fun bind(item: TransactionPayloadItem) {
             if (item is TransactionPayloadItem.ImageItem) {
                 binaryDataView.setImageBitmap(item.image)
diff --git a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadFragment.kt b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadFragment.kt
index 93312550e..ad219a5db 100644
--- a/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadFragment.kt
+++ b/library/src/main/java/com/chuckerteam/chucker/internal/ui/transaction/TransactionPayloadFragment.kt
@@ -61,9 +61,9 @@ internal class TransactionPayloadFragment :
         savedInstanceState: Bundle?
     ): View? =
         inflater.inflate(R.layout.chucker_fragment_transaction_payload, container, false).apply {
-            transactionContentList = findViewById(R.id.transaction_content)
+            transactionContentList = findViewById(R.id.chuckerTransactionResponseRecyclerView)
             transactionContentList.isNestedScrollingEnabled = false
-            progressLoading = findViewById(R.id.progress_loading_transaction)
+            progressLoading = findViewById(R.id.chuckerTransactionLoadingProgress)
         }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -182,8 +182,8 @@ internal class TransactionPayloadFragment :
         AsyncTask<Pair<Int, HttpTransaction>, Unit, List<TransactionPayloadItem>>() {
 
         override fun onPreExecute() {
-            val progressBar: ProgressBar? = fragment.view?.findViewById(R.id.progress_loading_transaction)
-            val recyclerView: RecyclerView? = fragment.view?.findViewById(R.id.transaction_content)
+            val progressBar: ProgressBar? = fragment.view?.findViewById(R.id.chuckerTransactionLoadingProgress)
+            val recyclerView: RecyclerView? = fragment.view?.findViewById(R.id.chuckerTransactionResponseRecyclerView)
             progressBar?.visibility = View.VISIBLE
             recyclerView?.visibility = View.INVISIBLE
         }
@@ -233,8 +233,8 @@ internal class TransactionPayloadFragment :
         }
 
         override fun onPostExecute(result: List<TransactionPayloadItem>) {
-            val progressBar: ProgressBar? = fragment.view?.findViewById(R.id.progress_loading_transaction)
-            val recyclerView: RecyclerView? = fragment.view?.findViewById(R.id.transaction_content)
+            val progressBar: ProgressBar? = fragment.view?.findViewById(R.id.chuckerTransactionLoadingProgress)
+            val recyclerView: RecyclerView? = fragment.view?.findViewById(R.id.chuckerTransactionResponseRecyclerView)
             progressBar?.visibility = View.INVISIBLE
             recyclerView?.visibility = View.VISIBLE
             recyclerView?.adapter = TransactionBodyAdapter(result)
diff --git a/library/src/main/res/drawable/chucker_ic_https_grey.xml b/library/src/main/res/drawable/chucker_ic_https_primary.xml
similarity index 93%
rename from library/src/main/res/drawable/chucker_ic_https_grey.xml
rename to library/src/main/res/drawable/chucker_ic_https_primary.xml
index 8ffd1fdd8..84a041788 100644
--- a/library/src/main/res/drawable/chucker_ic_https_grey.xml
+++ b/library/src/main/res/drawable/chucker_ic_https_primary.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF999999"
+        android:fillColor="#fff"
         android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
 </vector>
diff --git a/library/src/main/res/layout/chucker_activity_error.xml b/library/src/main/res/layout/chucker_activity_error.xml
index 097f746b8..3ea75ce3e 100644
--- a/library/src/main/res/layout/chucker_activity_error.xml
+++ b/library/src/main/res/layout/chucker_activity_error.xml
@@ -2,33 +2,30 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layoutDirection="ltr"
     tools:context="com.chuckerteam.chucker.internal.ui.error.ErrorActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/chuckerErrorToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:popupTheme="@style/Chucker.Theme">
 
             <TextView
-                android:id="@+id/toolbar_title"
+                android:id="@+id/chuckerErrorToolbarTitle"
                 style="@style/Chucker.TextAppearance.TransactionTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="Title" />
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <include layout="@layout/chucker_list_item_error" />
 
@@ -40,7 +37,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <TextView
-            android:id="@+id/stacktrace"
+            android:id="@+id/chuckerErrorStacktrace"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/chucker_doub_grid"
diff --git a/library/src/main/res/layout/chucker_activity_main.xml b/library/src/main/res/layout/chucker_activity_main.xml
index aaac8d24f..a7d7f5ae9 100644
--- a/library/src/main/res/layout/chucker_activity_main.xml
+++ b/library/src/main/res/layout/chucker_activity_main.xml
@@ -3,23 +3,21 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layoutDirection="ltr"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/chuckerTransactionToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="@style/Chucker.Theme" />
 
         <com.google.android.material.tabs.TabLayout
-                android:id="@+id/tabLayout"
+                android:id="@+id/chuckerMainTabLayout"
                 style="@style/Widget.MaterialComponents.TabLayout.PrimarySurface"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -27,7 +25,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewPager"
+        android:id="@+id/chuckerMainViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/library/src/main/res/layout/chucker_activity_transaction.xml b/library/src/main/res/layout/chucker_activity_transaction.xml
index 68dbbe574..73b3b9e7b 100644
--- a/library/src/main/res/layout/chucker_activity_transaction.xml
+++ b/library/src/main/res/layout/chucker_activity_transaction.xml
@@ -2,36 +2,33 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/main_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layoutDirection="ltr"
     tools:context="com.chuckerteam.chucker.internal.ui.transaction.TransactionActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/chuckerTransactionToolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:popupTheme="@style/Chucker.Theme" >
 
             <TextView
-                android:id="@+id/toolbar_title"
+                android:id="@+id/chuckerTransactionToolbarTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/chucker_doub_grid"
                 style="@style/Chucker.TextAppearance.TransactionTitle"
                 tools:text="Title"/>
 
-        </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.MaterialToolbar>
 
         <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabs"
+            android:id="@+id/chuckerTransactionTabLayout"
             style="@style/Widget.MaterialComponents.TabLayout.PrimarySurface"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
@@ -39,7 +36,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewpager"
+        android:id="@+id/chuckerTransactionViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
diff --git a/library/src/main/res/layout/chucker_fragment_error_list.xml b/library/src/main/res/layout/chucker_fragment_error_list.xml
index c0dad621e..51b21faba 100644
--- a/library/src/main/res/layout/chucker_fragment_error_list.xml
+++ b/library/src/main/res/layout/chucker_fragment_error_list.xml
@@ -3,11 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layoutDirection="ltr"
     android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list"
+        android:id="@+id/chuckerErrorsRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
@@ -15,7 +14,7 @@
         tools:listitem="@layout/chucker_list_item_error" />
 
     <LinearLayout
-        android:id="@+id/tutorial"
+        android:id="@+id/chuckerErrorsTutorialView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/chucker_doub_grid"
@@ -37,7 +36,7 @@
             android:text="@string/chucker_errors_tutorial" />
 
         <TextView
-            android:id="@+id/link"
+            android:id="@+id/chuckerErrorsTutorialLink"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/chucker_base_grid"
diff --git a/library/src/main/res/layout/chucker_fragment_transaction_list.xml b/library/src/main/res/layout/chucker_fragment_transaction_list.xml
index f63233367..3995ce935 100644
--- a/library/src/main/res/layout/chucker_fragment_transaction_list.xml
+++ b/library/src/main/res/layout/chucker_fragment_transaction_list.xml
@@ -3,11 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layoutDirection="ltr"
     android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list"
+        android:id="@+id/chuckerTransactionsRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
@@ -16,7 +15,7 @@
         tools:listitem="@layout/chucker_list_item_transaction" />
 
     <LinearLayout
-        android:id="@+id/tutorial"
+        android:id="@+id/chuckerTransactionsTutorialView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/chucker_doub_grid"
@@ -38,7 +37,7 @@
             android:text="@string/chucker_network_tutorial" />
 
         <TextView
-            android:id="@+id/link"
+            android:id="@+id/chuckerTransactionsLink"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/chucker_base_grid"
diff --git a/library/src/main/res/layout/chucker_fragment_transaction_overview.xml b/library/src/main/res/layout/chucker_fragment_transaction_overview.xml
index 736c2e73c..460067ed7 100644
--- a/library/src/main/res/layout/chucker_fragment_transaction_overview.xml
+++ b/library/src/main/res/layout/chucker_fragment_transaction_overview.xml
@@ -1,248 +1,255 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<ScrollView 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">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="vertical"
-    android:layoutDirection="ltr"
-    tools:context="com.chuckerteam.chucker.internal.ui.transaction.TransactionOverviewFragment">
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:stretchColumns="1">
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/chucker_url"
-            style="@style/Chucker.TextAppearance.Label"/>
-
-        <TextView
-            android:id="@+id/url"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/Chucker.TextAppearance.Value"
-            tools:text="https://example.com/path/to/resource?here=might_be_really_long"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_method"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/method"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="GET"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_protocol"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/protocol"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="HTTP/1.1"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_status"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="Complete"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_response"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/response"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="200 OK"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_ssl"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/ssl"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="Yes"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_request_time"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/request_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="05/02/17 11:52:49"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_response_time"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/response_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="05/02/17 11:52:49"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_duration"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/duration"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="405 ms"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="8dp">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_request_size"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/request_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="53 KB"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_response_size"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/response_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="148 KB"/>
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/chucker_total_size"
-                style="@style/Chucker.TextAppearance.Label"/>
-
-            <TextView
-                android:id="@+id/total_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/Chucker.TextAppearance.Value"
-                tools:text="201 KB"/>
-
-        </TableRow>
-
-    </TableLayout>
-
-</androidx.core.widget.NestedScrollView>
+    android:layout_height="wrap_content"
+    android:padding="@dimen/chucker_doub_grid">
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/chuckerTransactionOverviewGuideline"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      app:layout_constraintGuide_percent="0.28" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:gravity="start"
+      android:text="@string/chucker_url"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewUrl"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:gravity="start"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toTopOf="parent"
+      tools:text="https://example.com/path/to/resource?here=might_be_really_long" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_method"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewUrl" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewMethod"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@+id/chuckerTransactionOverviewUrl"
+      tools:text="GET" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_protocol"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewMethod" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewProtocol"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewMethod"
+      tools:text="HTTP/1.1" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_status"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewProtocol" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewStatus"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewProtocol"
+      tools:text="Complete" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_response"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewStatus" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewResponse"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewStatus"
+      tools:text="200 OK" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_ssl"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewResponse" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewSsl"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewResponse"
+      tools:text="Yes" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/chucker_base_grid"
+      android:text="@string/chucker_request_time"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewSsl" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewRequestTime"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/chucker_base_grid"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewSsl"
+      tools:text="05/02/17 11:52:49" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_response_time"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewRequestTime" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewResponseTime"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewRequestTime"
+      tools:text="05/02/17 11:52:49" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_duration"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewResponseTime" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewDuration"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewResponseTime"
+      tools:text="405 ms" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/chucker_base_grid"
+      android:text="@string/chucker_request_size"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewDuration" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewRequestSize"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/chucker_base_grid"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewDuration"
+      tools:text="53 KB" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_response_size"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewRequestSize" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewResponseSize"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewRequestSize"
+      tools:text="148 KB" />
+
+    <TextView
+      style="@style/Chucker.TextAppearance.Label"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="@string/chucker_total_size"
+      app:layout_constraintEnd_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewResponseSize" />
+
+    <TextView
+      android:id="@+id/chuckerTransactionOverviewTotalSize"
+      style="@style/Chucker.TextAppearance.Value"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@id/chuckerTransactionOverviewGuideline"
+      app:layout_constraintTop_toBottomOf="@id/chuckerTransactionOverviewResponseSize"
+      tools:text="201 KB" />
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/library/src/main/res/layout/chucker_fragment_transaction_payload.xml b/library/src/main/res/layout/chucker_fragment_transaction_payload.xml
index e4d0a6e84..842d46d4d 100755
--- a/library/src/main/res/layout/chucker_fragment_transaction_payload.xml
+++ b/library/src/main/res/layout/chucker_fragment_transaction_payload.xml
@@ -5,11 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
-    android:layoutDirection="ltr"
     tools:context="com.chuckerteam.chucker.internal.ui.transaction.TransactionPayloadFragment">
 
     <ProgressBar
-        android:id="@+id/progress_loading_transaction"
+        android:id="@+id/chuckerTransactionLoadingProgress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
@@ -18,7 +17,7 @@
         android:visibility="visible" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/transaction_content"
+        android:id="@+id/chuckerTransactionResponseRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
diff --git a/library/src/main/res/layout/chucker_list_item_error.xml b/library/src/main/res/layout/chucker_list_item_error.xml
index 5fd0a6d68..9fd26af12 100644
--- a/library/src/main/res/layout/chucker_list_item_error.xml
+++ b/library/src/main/res/layout/chucker_list_item_error.xml
@@ -5,11 +5,10 @@
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
     android:orientation="vertical"
-    android:layoutDirection="ltr"
     android:padding="8dp">
 
     <TextView
-        android:id="@+id/clazz"
+        android:id="@+id/chuckerItemErrorClazz"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="2dp"
@@ -17,20 +16,20 @@
         tools:text="java.lang.RuntimeException" />
 
     <TextView
-        android:id="@+id/tag"
+        android:id="@+id/chuckerItemErrorTag"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="@style/Chucker.TextAppearance.Label"
         tools:text="A given tag" />
 
     <TextView
-        android:id="@+id/message"
+        android:id="@+id/chuckerItemErrorMessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:text="Something gone wrong!" />
 
     <TextView
-        android:id="@+id/date"
+        android:id="@+id/chuckerItemErrorDate"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="right|end"
diff --git a/library/src/main/res/layout/chucker_list_item_transaction.xml b/library/src/main/res/layout/chucker_list_item_transaction.xml
index 4015951b9..360d10c1b 100644
--- a/library/src/main/res/layout/chucker_list_item_transaction.xml
+++ b/library/src/main/res/layout/chucker_list_item_transaction.xml
@@ -5,18 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:layoutDirection="ltr"
     android:padding="@dimen/chucker_base_grid">
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/time_guideline"
+        android:id="@+id/chuckerTransactionItemGuideline"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintGuide_percent="0.5" />
 
     <TextView
-        android:id="@+id/code"
+        android:id="@+id/chuckerTransactionItemCode"
         android:layout_width="@dimen/chucker_item_size"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -27,66 +26,66 @@
         tools:text="200" />
 
     <TextView
-        android:id="@+id/path"
+        android:id="@+id/chuckerTransactionItemPath"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textAppearance="@style/Chucker.TextAppearance.ListItem"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/code"
+        app:layout_constraintStart_toEndOf="@+id/chuckerTransactionItemCode"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="GET /path/to/some/resource?goes=here" />
 
     <TextView
-        android:id="@+id/host"
+        android:id="@+id/chuckerTransactionItemHost"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/chucker_half_grid"
-        app:layout_constraintBottom_toBottomOf="@+id/ssl"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/ssl"
-        app:layout_constraintTop_toTopOf="@+id/ssl"
+        app:layout_constraintStart_toEndOf="@+id/chuckerTransactionItemSsl"
+        app:layout_constraintTop_toBottomOf="@+id/chuckerTransactionItemPath"
         app:layout_goneMarginStart="0dp"
         app:layout_goneMarginTop="@dimen/chucker_doub_grid"
         tools:text="example.com" />
 
     <ImageView
-        android:id="@+id/ssl"
+        android:id="@+id/chuckerTransactionItemSsl"
         android:layout_width="@dimen/chucker_doub_grid"
         android:layout_height="@dimen/chucker_doub_grid"
         android:contentDescription="@string/chucker_ssl"
-        android:src="@drawable/chucker_ic_https_grey"
+        android:src="@drawable/chucker_ic_https_primary"
         android:tint="@color/chucker_color_primary"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="@+id/path"
-        app:layout_constraintTop_toBottomOf="@+id/path"
+        app:layout_constraintStart_toStartOf="@+id/chuckerTransactionItemPath"
+        app:layout_constraintTop_toTopOf="@+id/chuckerTransactionItemHost"
+        app:layout_constraintBottom_toBottomOf="@id/chuckerTransactionItemHost"
         tools:visibility="visible" />
 
     <TextView
-        android:id="@+id/time_start"
+        android:id="@+id/chuckerTransactionItemTimeStart"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toStartOf="@+id/duration"
-        app:layout_constraintStart_toStartOf="@+id/path"
-        app:layout_constraintTop_toBottomOf="@+id/host"
+        app:layout_constraintEnd_toStartOf="@+id/chuckerTransactionItemDuration"
+        app:layout_constraintStart_toStartOf="@+id/chuckerTransactionItemPath"
+        app:layout_constraintTop_toBottomOf="@+id/chuckerTransactionItemHost"
         tools:text="18:29:07 PM" />
 
     <TextView
-        android:id="@+id/duration"
+        android:id="@+id/chuckerTransactionItemDuration"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="start"
-        app:layout_constraintEnd_toStartOf="@+id/size"
-        app:layout_constraintStart_toEndOf="@+id/time_guideline"
-        app:layout_constraintTop_toTopOf="@+id/time_start"
+        app:layout_constraintEnd_toStartOf="@+id/chuckerTransactionItemSize"
+        app:layout_constraintStart_toEndOf="@+id/chuckerTransactionItemGuideline"
+        app:layout_constraintTop_toTopOf="@+id/chuckerTransactionItemTimeStart"
         tools:text="8023 ms" />
 
     <TextView
-        android:id="@+id/size"
+        android:id="@+id/chuckerTransactionItemSize"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="end"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/duration"
-        app:layout_constraintTop_toTopOf="@+id/duration"
+        app:layout_constraintStart_toEndOf="@+id/chuckerTransactionItemDuration"
+        app:layout_constraintTop_toTopOf="@+id/chuckerTransactionItemDuration"
         tools:text="16.45 KB" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/library/src/main/res/layout/chucker_transaction_item_body_line.xml b/library/src/main/res/layout/chucker_transaction_item_body_line.xml
index bb01550a5..2d12da4ff 100644
--- a/library/src/main/res/layout/chucker_transaction_item_body_line.xml
+++ b/library/src/main/res/layout/chucker_transaction_item_body_line.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/body_line"
+    android:id="@+id/chuckerTransactionResponseBodyLine"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textIsSelectable="true"
diff --git a/library/src/main/res/layout/chucker_transaction_item_headers.xml b/library/src/main/res/layout/chucker_transaction_item_headers.xml
index acdae57dc..b1dca0a49 100644
--- a/library/src/main/res/layout/chucker_transaction_item_headers.xml
+++ b/library/src/main/res/layout/chucker_transaction_item_headers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headers"
+    android:id="@+id/chuckerTransactionResponseHeaders"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/chucker_doub_grid"
diff --git a/library/src/main/res/layout/chucker_transaction_item_image.xml b/library/src/main/res/layout/chucker_transaction_item_image.xml
index e599b93fc..1c311fe10 100644
--- a/library/src/main/res/layout/chucker_transaction_item_image.xml
+++ b/library/src/main/res/layout/chucker_transaction_item_image.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/binary_data"
+    android:id="@+id/chuckerTransactionResponseBinaryData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/chucker_doub_grid"
diff --git a/library/src/main/res/values-v21/styles.xml b/library/src/main/res/values-v21/styles.xml
index b6a4b78ec..9f0086f22 100644
--- a/library/src/main/res/values-v21/styles.xml
+++ b/library/src/main/res/values-v21/styles.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Chucker.TextAppearance.ListItem" parent="android:TextAppearance">
-        <item name="android:textStyle">normal</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
 
-    <style name="Chucker.TextAppearance.Label" parent="android:TextAppearance.Small">
-        <item name="android:textStyle">normal</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
+   <style name="Chucker.Theme" parent="Chucker.BaseTheme">
+     <item name="android:textDirection">locale</item>
+     <item name="android:textAlignment">viewStart</item>
+   </style>
+
 </resources>
\ No newline at end of file
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index 12d96bddf..5beff4991 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Chucker.Theme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="colorPrimary">@color/chucker_color_primary</item>
-        <item name="colorPrimaryDark">@color/chucker_color_primary_variant</item>
-        <item name="colorSecondary">@color/chucker_color_secondary</item>
-        <item name="android:colorBackground">@color/chucker_color_background</item>
-        <item name="colorSurface">@color/chucker_color_surface</item>
-        <item name="colorError">@color/chucker_status_error</item>
-        <item name="colorOnPrimary">@color/chucker_color_on_primary</item>
-        <item name="colorOnSecondary">@color/chucker_color_on_secondary</item>
-        <item name="colorOnBackground">@color/chucker_color_on_background</item>
-        <item name="colorOnSurface">@color/chucker_color_on_surface</item>
-        <item name="colorOnError">@color/chucker_color_on_error</item>
+    <style name="Chucker.BaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+      <item name="colorPrimary">@color/chucker_color_primary</item>
+      <item name="colorPrimaryDark">@color/chucker_color_primary_variant</item>
+      <item name="colorSecondary">@color/chucker_color_secondary</item>
+      <item name="android:colorBackground">@color/chucker_color_background</item>
+      <item name="colorSurface">@color/chucker_color_surface</item>
+      <item name="colorError">@color/chucker_status_error</item>
+      <item name="colorOnPrimary">@color/chucker_color_on_primary</item>
+      <item name="colorOnSecondary">@color/chucker_color_on_secondary</item>
+      <item name="colorOnBackground">@color/chucker_color_on_background</item>
+      <item name="colorOnSurface">@color/chucker_color_on_surface</item>
+      <item name="colorOnError">@color/chucker_color_on_error</item>
     </style>
 
+    <style name="Chucker.Theme" parent="Chucker.BaseTheme"/>
+
     <style name="Chucker.TextAppearance.ListItem" parent="android:TextAppearance">
         <item name="android:textStyle">bold</item>
     </style>
@@ -25,13 +27,11 @@
 
     <style name="Chucker.TextAppearance.Value" parent="android:TextAppearance.Small">
         <item name="android:paddingLeft">16dp</item>
-        <item name="android:layout_weight">1</item>
         <item name="android:textIsSelectable">true</item>
     </style>
 
     <style name="Chucker.TextAppearance.TransactionTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:gravity">top</item>
-        <item name="android:textSize" tools:ignore="SpUsage">16dp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:maxLines">2</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index f24579121..8cff3729f 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -9,7 +9,6 @@
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name="com.chuckerteam.chucker.sample.MainActivity">