diff --git a/app/build.gradle b/app/build.gradle
index d359e0d..858b712 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
-
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.dataart.btle_android"
-        minSdkVersion 19
-        targetSdkVersion 27
-        versionCode 3
-        versionName "3.0"
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 4
+        versionName "4.0"
         multiDexEnabled true
     }
     buildTypes {
@@ -27,23 +25,24 @@ android {
 ext {
     devicehive = "3.1.2"
     commons = "1.11"
-    rxandroid = "2.0.1"
-    rxjava = "2.1.7"
-    guava = "23.6-android"
-    gson = "2.8.2"
-    timber = "4.6.0"
+    rxandroid = "2.1.1"
+    rxjava = "2.2.19"
+    guava = "24.1-jre"
+    gson = "2.8.6"
+    timber = "4.7.1"
     support = "27.0.2"
-    gms = "11.8.0"
-    multidex = "1.0.2"
+    gms = "17.0.0"
+    materialVersion = '1.3.0-alpha02'
+    constraintLayoutVersion = '2.0.1'
 }
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:appcompat-v7:${support}"
-    implementation "com.android.support:design:${support}"
-
+    implementation "com.google.android.material:material:$materialVersion"
     implementation "com.google.code.gson:gson:${gson}"
 
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
+
     implementation "com.jakewharton.timber:timber:${timber}"
 
     implementation "commons-codec:commons-codec:${commons}"
@@ -58,5 +57,4 @@ dependencies {
     implementation "com.google.guava:guava:${guava}"
 
     implementation "com.github.devicehive:devicehive-java:${devicehive}"
-    implementation "com.android.support:multidex:${multidex}"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65318a6..f47f990 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <!--Location access is necessary for BLE devices discovery under Android M-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/app/src/main/java/com/dataart/btle_android/BTLEApplication.java b/app/src/main/java/com/dataart/btle_android/BTLEApplication.java
index 0e63f57..68be216 100644
--- a/app/src/main/java/com/dataart/btle_android/BTLEApplication.java
+++ b/app/src/main/java/com/dataart/btle_android/BTLEApplication.java
@@ -1,17 +1,14 @@
 package com.dataart.btle_android;
 
-import android.support.multidex.MultiDex;
-import android.support.multidex.MultiDexApplication;
-
+import android.app.Application;
 import com.dataart.btle_android.devicehive.BTLEDevicePreferences;
-
 import timber.log.Timber;
 
 /**
  * Created by alrybakov
  */
 
-public class BTLEApplication extends MultiDexApplication {
+public class BTLEApplication extends Application {
 
     private static BTLEApplication application;
 
@@ -23,7 +20,6 @@ public static BTLEApplication getApplication() {
     public void onCreate() {
         super.onCreate();
         application = this;
-        MultiDex.install(this);
         BTLEDevicePreferences.getInstance().init(this);
         if (BuildConfig.DEBUG){
             Timber.plant(new Timber.DebugTree());
diff --git a/app/src/main/java/com/dataart/btle_android/MainActivity.java b/app/src/main/java/com/dataart/btle_android/MainActivity.java
index 6511d29..d945ec7 100644
--- a/app/src/main/java/com/dataart/btle_android/MainActivity.java
+++ b/app/src/main/java/com/dataart/btle_android/MainActivity.java
@@ -8,22 +8,24 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
 import com.dataart.btle_android.btle_gateway.BluetoothLeService;
 import com.dataart.btle_android.devicehive.BTLEDevicePreferences;
 import com.dataart.btle_android.helpers.BleHelpersFactory;
 import com.dataart.btle_android.helpers.ble.base.BleInitializer;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
 
 import java.util.Objects;
 import java.util.UUID;
@@ -36,12 +38,15 @@ public class MainActivity extends AppCompatActivity {
     private BleInitializer bleInitializer;
 
     private BluetoothManager mBluetoothManager;
-    private EditText serverUrlEditText;
-    private EditText gatewayIdEditText;
-    private EditText refreshTokenEditText;
+    private TextInputEditText serverUrlEditText;
+    private TextInputLayout serverUrlEditTextParent;
+    private TextInputEditText gatewayIdEditText;
+    private TextInputLayout gatewayIdEditTextParent;
+    private TextInputEditText refreshTokenEditText;
+    private TextInputLayout refreshTokenEditTextParent;
     private TextView hintText;
-    private Button serviceButton;
-    private Button restartServiceButton;
+    private FloatingActionButton serviceButton;
+    private FloatingActionButton restartServiceButton;
     private BTLEDevicePreferences prefs;
     private boolean isServiceStarted;
     private final View.OnClickListener restartClickListener = new View.OnClickListener() {
@@ -83,11 +88,6 @@ public void afterTextChanged(Editable editable) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-        Toolbar myToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(myToolbar);
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setTitle(R.string.app_name);
-        }
 //        BleInitializer will start service on initialization success
         bleInitializer = BleHelpersFactory.getInitializer(this, bluetoothAdapter -> startService());
         init();
@@ -114,8 +114,11 @@ private void init() {
         prefs = BTLEDevicePreferences.getInstance();
 
         serverUrlEditText = findViewById(R.id.server_url_edit);
+        serverUrlEditTextParent = findViewById(R.id.server_url_parent);
         gatewayIdEditText = findViewById(R.id.settings_gateway_id);
+        gatewayIdEditTextParent = findViewById(R.id.settings_gateway_id_parent);
         refreshTokenEditText = findViewById(R.id.refresh_token_edit);
+        refreshTokenEditTextParent = findViewById(R.id.refresh_token_parent);
         hintText = findViewById(R.id.hintText);
 
         resetValues();
@@ -212,12 +215,12 @@ private void startService() {
 
     private void onServiceRunning() {
         isServiceStarted = true;
-        serviceButton.setText(R.string.button_stop);
+        serviceButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_stop));
     }
 
     private void onServiceStopped() {
         isServiceStarted = false;
-        serviceButton.setText(R.string.button_start);
+        serviceButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_play_arrow));
     }
 
     private boolean isRestartRequired() {
@@ -234,7 +237,7 @@ private void onDataChanged() {
         if (isServiceStarted && isRestartRequired()) {
             hintText.setVisibility(View.VISIBLE);
             restartServiceButton.setVisibility(View.VISIBLE);
-            serviceButton.setVisibility(View.GONE);
+            serviceButton.setVisibility(View.INVISIBLE);
         } else {
             hintText.setVisibility(View.GONE);
             restartServiceButton.setVisibility(View.GONE);
@@ -254,7 +257,7 @@ private void resetValues() {
         gatewayIdEditText.setText(
                 TextUtils.isEmpty(gatewayId)
                         ? getString(R.string.default_gateway_id) + "-" +
-                            UUID.randomUUID().toString().substring(0, 4)
+                        UUID.randomUUID().toString().substring(0, 4)
                         : gatewayId
         );
 
@@ -267,9 +270,9 @@ private void resetValues() {
     }
 
     private void resetErrors() {
-        serverUrlEditText.setError(null);
-        gatewayIdEditText.setError(null);
-        refreshTokenEditText.setError(null);
+        serverUrlEditTextParent.setError(null);
+        gatewayIdEditTextParent.setError(null);
+        refreshTokenEditTextParent.setError(null);
     }
 
     private boolean validateValues() {
@@ -280,13 +283,13 @@ private boolean validateValues() {
         final String refreshToken = refreshTokenEditText.getText().toString();
 
         if (TextUtils.isEmpty(serverUrl)) {
-            serverUrlEditText.setError(getString(R.string.error_message_empty_server_url));
+            serverUrlEditTextParent.setError(getString(R.string.error_message_empty_server_url));
             serverUrlEditText.requestFocus();
         } else if (TextUtils.isEmpty(gatewayId)) {
-            gatewayIdEditText.setError(getString(R.string.error_message_empty_gateway_id));
+            gatewayIdEditTextParent.setError(getString(R.string.error_message_empty_gateway_id));
             gatewayIdEditText.requestFocus();
         } else if (TextUtils.isEmpty(refreshToken)) {
-            refreshTokenEditText.setError(getString(R.string.error_message_empty_refresh_token));
+            refreshTokenEditTextParent.setError(getString(R.string.error_message_empty_refresh_token));
             refreshTokenEditText.requestFocus();
         } else {
             return true;
diff --git a/app/src/main/java/com/dataart/btle_android/btle_gateway/BluetoothLeService.java b/app/src/main/java/com/dataart/btle_android/btle_gateway/BluetoothLeService.java
index f5ac9ee..9f5470e 100644
--- a/app/src/main/java/com/dataart/btle_android/btle_gateway/BluetoothLeService.java
+++ b/app/src/main/java/com/dataart/btle_android/btle_gateway/BluetoothLeService.java
@@ -1,5 +1,7 @@
 package com.dataart.btle_android.btle_gateway;
 
+import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -10,16 +12,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
 import android.widget.Toast;
-
+import androidx.core.app.NotificationCompat;
 import com.dataart.btle_android.MainActivity;
 import com.dataart.btle_android.R;
 import com.dataart.btle_android.btle_gateway.server.BluetoothServer;
 import com.dataart.btle_android.devicehive.BTLEDeviceHive;
 import com.github.devicehive.client.service.DeviceCommand;
-
 import timber.log.Timber;
 
 /**
@@ -33,6 +34,8 @@ public class BluetoothLeService extends Service {
             .concat("ACTION_BT_PERMISSION_REQUEST");
 
     private final static int LE_NOTIFICATION_ID = 1;
+    private final static String LE_NOTIFICATION_NAME = "DeviceHive";
+    private final static String LE_NOTIFICATION_CHANNEL_ID = "devicehive";
 
     private NotificationManager mNotificationManager;
     private NotificationCompat.Builder mBuilder;
@@ -49,7 +52,11 @@ public BluetoothLeService() {
     }
 
     public static void start(final Context context) {
-        context.startService(new Intent(context, BluetoothLeService.class));
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            context.startForegroundService(new Intent(context, BluetoothLeService.class));
+        } else {
+            context.startService(new Intent(context, BluetoothLeService.class));
+        }
     }
 
     public static void stop(final Context context) {
@@ -86,7 +93,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         mDeviceHive.registerDevice();
 
-        setNotification();
+        Notification notification = prepareNotification();
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            startForeground(LE_NOTIFICATION_ID, notification);
+        } else {
+            mNotificationManager.notify(LE_NOTIFICATION_ID, mBuilder.build());
+        }
         return START_NOT_STICKY;
     }
 
@@ -156,13 +169,20 @@ private void send(final String action) {
         sendBroadcast(intent);
     }
 
-    private void setNotification() {
+    private Notification prepareNotification() {
         final Intent resultIntent = new Intent(this, MainActivity.class);
         final TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
         stackBuilder.addParentStack(MainActivity.class);
         stackBuilder.addNextIntent(resultIntent);
         final PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
-        mBuilder = new NotificationCompat.Builder(this, "channel_id_1")
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(LE_NOTIFICATION_CHANNEL_ID, LE_NOTIFICATION_NAME, NotificationManager.IMPORTANCE_HIGH);
+            channel.enableVibration(false);
+            channel.setShowBadge(true);
+            mNotificationManager.createNotificationChannel(channel);
+        }
+
+        mBuilder = new NotificationCompat.Builder(this, LE_NOTIFICATION_CHANNEL_ID)
                 .setContentText(getString(R.string.notification_bt_on))
                 .setContentTitle(getString(R.string.device_hive))
                 .setSmallIcon(R.drawable.ic_le_service)
@@ -170,7 +190,11 @@ private void setNotification() {
                 .setOngoing(true)
                 .setContentIntent(resultPendingIntent);
 
-        mNotificationManager.notify(LE_NOTIFICATION_ID, mBuilder.build());
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            mBuilder.setChannelId(LE_NOTIFICATION_CHANNEL_ID);
+        }
+
+        return mBuilder.build();
     }
 
 }
diff --git a/app/src/main/java/com/dataart/btle_android/btle_gateway/server/BluetoothServer.java b/app/src/main/java/com/dataart/btle_android/btle_gateway/server/BluetoothServer.java
index b67e271..5956fd0 100644
--- a/app/src/main/java/com/dataart/btle_android/btle_gateway/server/BluetoothServer.java
+++ b/app/src/main/java/com/dataart/btle_android/btle_gateway/server/BluetoothServer.java
@@ -241,7 +241,12 @@ DeviceConnection connectAndSave(String address, BluetoothDevice device, Interact
 
     private DeviceConnection connectAndSave(String address, BluetoothDevice device, InteractiveGattCallback.DisconnectListener disconnectListener, InteractiveGattCallback.StatusListener statusListener, InteractiveGattCallback.OnConnectedListener connectedListener) {
         final InteractiveGattCallback callback = new InteractiveGattCallback(address, statusListener, context, disconnectListener, connectedListener);
-        BluetoothGatt gatt = device.connectGatt(context, false, callback);
+        BluetoothGatt gatt = null;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            gatt = device.connectGatt(context, false, callback, BluetoothDevice.TRANSPORT_LE);
+        } else {
+            gatt = device.connectGatt(context, false, callback);
+        }
         DeviceConnection connection = new DeviceConnection(address, gatt, callback);
         activeConnections.put(address, connection);
         return connection;
diff --git a/app/src/main/java/com/dataart/btle_android/devicehive/BTLEDeviceHive.java b/app/src/main/java/com/dataart/btle_android/devicehive/BTLEDeviceHive.java
index 5efc9ea..6957412 100644
--- a/app/src/main/java/com/dataart/btle_android/devicehive/BTLEDeviceHive.java
+++ b/app/src/main/java/com/dataart/btle_android/devicehive/BTLEDeviceHive.java
@@ -88,10 +88,11 @@ public void run() {
                     deviceListener.onDeviceReceived(device);
                     device.subscribeCommands(new CommandFilter(), new DeviceCommandsCallback() {
                         public void onSuccess(List<DeviceCommand> commands) {
-                            for(DeviceCommand command: commands) {
+                            for (DeviceCommand command : commands) {
                                 notifyListenersCommandReceived(command);
                             }
                         }
+
                         public void onFail(FailureData failureData) {
                         }
                     });
@@ -107,7 +108,7 @@ public void disconnect() {
         Thread thread = new Thread() {
             public void run() {
                 deviceListener.onDeviceReceived(null);
-                deviceHive.unsubscribeAllCommands();
+                if (deviceHive != null) deviceHive.unsubscribeAllCommands();
                 deviceHive = null;
             }
         };
diff --git a/app/src/main/java/com/dataart/btle_android/devicehive/DeviceHiveConfig.java b/app/src/main/java/com/dataart/btle_android/devicehive/DeviceHiveConfig.java
index a826b42..80d04a3 100644
--- a/app/src/main/java/com/dataart/btle_android/devicehive/DeviceHiveConfig.java
+++ b/app/src/main/java/com/dataart/btle_android/devicehive/DeviceHiveConfig.java
@@ -2,6 +2,6 @@
 
 public final class DeviceHiveConfig {
 
-    public static final String API_ENDPOINT = "http://playground.devicehive.com/api/rest";
+    public static final String API_ENDPOINT = "https://playground.devicehive.com/api/rest";
 
 }
diff --git a/app/src/main/java/com/dataart/btle_android/helpers/LocationHelper.java b/app/src/main/java/com/dataart/btle_android/helpers/LocationHelper.java
index 61481bf..e7052f3 100644
--- a/app/src/main/java/com/dataart/btle_android/helpers/LocationHelper.java
+++ b/app/src/main/java/com/dataart/btle_android/helpers/LocationHelper.java
@@ -1,6 +1,5 @@
 package com.dataart.btle_android.helpers;
 
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -9,9 +8,8 @@
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.dataart.btle_android.R;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
@@ -26,7 +24,6 @@
 import com.google.android.gms.location.LocationSettingsStatusCodes;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
-
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/res/drawable/ic_play_arrow.xml b/app/src/main/res/drawable/ic_play_arrow.xml
new file mode 100644
index 0000000..a92dd19
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_repeat.xml b/app/src/main/res/drawable/ic_repeat.xml
new file mode 100644
index 0000000..ca56235
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml
new file mode 100644
index 0000000..a9e8c66
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stop.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,6h12v12H6z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 0f52517..c967b3f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,132 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="@dimen/toolbar_elevation"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-        tools:targetApi="lollipop" />
-
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/toolbar">
+        android:fillViewport="true"
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:focusableInTouchMode="true" />
-
-            <LinearLayout
-                style="@style/ListItem"
-                android:layout_marginTop="@dimen/padding">
-
-                <TextView
-                    android:labelFor="@+id/server_url_edit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_server_url"
-                    android:textAppearance="@android:style/TextAppearance.Medium" />
+            android:layout_height="match_parent"
+            android:padding="@dimen/padding">
+
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="@dimen/logo_size"
+                android:layout_height="@dimen/logo_size"
+                android:layout_marginBottom="@dimen/margin_and_a_half"
+                android:src="@mipmap/ic_launcher"
+                app:layout_constraintBottom_toTopOf="@id/server_url_parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/server_url_parent"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/margin_half"
+                app:layout_constraintBottom_toTopOf="@id/settings_gateway_id_parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/logo">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/server_url_edit"
-                    style="@style/SingleLineEditText"
-                    android:imeOptions="actionNext"
-                    android:inputType="textUri" />
-            </LinearLayout>
-
-            <View style="@style/ListItemDivider" />
-
-            <LinearLayout
-                style="@style/ListItem"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:labelFor="@+id/settings_gateway_id"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/settings_gateway_id"
-                    android:textAppearance="@android:style/TextAppearance.Medium" />
+                    android:hint="@string/settings_server_url"
+                    android:imeOptions="actionNext"
+                    android:lines="1"
+                    android:inputType="text"
+                    android:maxLines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/settings_gateway_id_parent"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/margin_half"
+                app:layout_constraintBottom_toTopOf="@id/refresh_token_parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/server_url_parent">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/settings_gateway_id"
-                    style="@style/SingleLineEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/settings_gateway_id"
                     android:imeOptions="actionNext"
+                    android:lines="1"
+                    android:inputType="text"
+                    android:maxLines="1"
                     android:text="@string/default_gateway_id" />
-            </LinearLayout>
-
-            <View style="@style/ListItemDivider" />
-
-            <LinearLayout style="@style/ListItem">
+            </com.google.android.material.textfield.TextInputLayout>
 
-                <TextView
-                    android:labelFor="@+id/refresh_token_edit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_refresh_token"
-                    android:textAppearance="@android:style/TextAppearance.Medium" />
-
-                <EditText
-                    android:id="@+id/refresh_token_edit"
-                    style="@style/SingleLineEditText"
-                    android:imeOptions="actionNext" />
-            </LinearLayout>
-
-            <View style="@style/ListItemDivider" />
-
-            <RelativeLayout
-                style="@style/ViewWithPadding"
-                android:layout_width="match_parent"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/refresh_token_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp">
-
-                <Button
-                    android:id="@+id/service_button"
-                    android:layout_width="160dp"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:text="@string/button_start" />
+                app:layout_constraintBottom_toTopOf="@id/hintText"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/settings_gateway_id_parent">
 
-                <Button
-                    android:id="@+id/save_button"
-                    android:layout_width="160dp"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/refresh_token_edit"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:text="@string/button_restart"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
-
-            <TextView
+                    android:hint="@string/settings_refresh_token"
+                    android:imeOptions="actionDone"
+                    android:lines="1"
+                    android:inputType="text"
+                    android:maxLines="1" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/hintText"
                 style="@style/ViewWithPadding"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:drawableStart="@drawable/ic_information"
+                android:layout_marginTop="@dimen/margin_half"
+                android:layout_marginBottom="@dimen/margin_half"
                 android:gravity="center"
                 android:text="@string/settings_restart_hint"
                 android:textAppearance="@android:style/TextAppearance.Medium"
-                android:textColor="#ff858585"
-                android:visibility="gone" />
+                android:textColor="@color/hint_color"
+                android:visibility="gone"
+                app:drawableStartCompat="@drawable/ic_information"
+                app:layout_constraintBottom_toTopOf="@id/space"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/refresh_token_parent"
+                tools:visibility="visible" />
+
+            <Space
+                android:id="@+id/space"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/space_height"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/hintText" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/service_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_play_arrow"
+        app:layout_anchor="@id/bottomBar" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/save_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_repeat"
+        android:visibility="gone"
+        app:layout_anchor="@id/service_button"
+        app:layout_anchorGravity="center"
+        tools:visibility="visible" />
+
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/bottomBar"
+        style="@style/Widget.MaterialComponents.BottomAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:backgroundTint="?attr/colorBackgroundFloating"
+        app:fabAlignmentMode="center"
+        app:hideOnScroll="true"
+        app:layout_scrollFlags="scroll|snap" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
 
-        </LinearLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 8f851fd..0000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e497ead..038d7f6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#000</color>
-    <color name="colorPrimaryDark">#444</color>
-</resources>
\ No newline at end of file
+    <color name="colorPrimaryDark">#133048</color>
+    <color name="colorPrimary">#457186</color>
+    <color name="colorAccent">#00BCD4</color>
+    <color name="colorInactive">#808080</color>
+    <color name="hint_color">#ff858585</color>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 067384d..592a1d2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,4 +3,8 @@
          https://developer.android.com/design/patterns/navigation-drawer.html -->
     <dimen name="padding">10dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
+    <dimen name="margin_half">8dp</dimen>
+    <dimen name="space_height">80dp</dimen>
+    <dimen name="logo_size">80dp</dimen>
+    <dimen name="margin_and_a_half">24dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fbc2f4..ac0a52b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="button_start">Start service</string>
     <string name="button_stop">Stop service</string>
 
-    <string name="default_server_url">http://playground.devicehive.com/api/rest</string>
+    <string name="default_server_url">https://playground.devicehive.com/api/rest</string>
     <string name="default_gateway_id">devicehive-ble-android</string>
 
     <string name="error_message_btle_not_supported">Bluetooth LE is not supported.\nApplication will close itself</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6f4afe3..d8725e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,12 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorSecondary">@color/colorAccent</item>
+        <item name="colorOnSecondary">@android:color/white</item>
     </style>
 
     <style name="ListItem">
diff --git a/build.gradle b/build.gradle
index 7bf22ca..f36a6a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle.properties b/gradle.properties
index a9dabe1..091f0be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,11 +6,30 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4G -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#android.enableAapt2=false
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-#Fixes error default or static interface method used without --min-sdk-version >= 24
-android.enableD8=true
\ No newline at end of file
+#Enable daemon
+org.gradle.daemon=true
+#The build cache stores certain outputs that the Android plugin for Gradle generates
+# when building your project (such as unpackaged AARs and pre-dexed remote dependencies).
+# Your clean builds are much faster while using the cache because
+# the build system can simply reuse those cached files during subsequent builds,
+# instead of recreating them.
+# The build cache also works on continuous integration servers
+# and when running multiple build processes on a single local machine.
+org.gradle.caching=true
+# Enables new incubating mode that makes Gradle selective when configuring projects.
+# Only relevant projects are configured which results in faster builds for large multi-projects.
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
+org.gradle.configureondemand=true
+# Set to true or false to enable or disable the build cache.
+# If this parameter is not set, the build cache is disabled by default.
+# http://tools.android.com/tech-docs/build-cache
+android.enableBuildCache=true
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bace488..2388ec4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 14 15:13:57 EET 2017
+#Fri Sep 18 19:19:58 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip