diff --git a/app/build.gradle b/app/build.gradle
index 73b60393..11d81c4f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,32 +55,30 @@ dependencies {
     implementation 'com.dmitrymalkovich.android:progress-fab:1.6'
     implementation 'com.wang.avi:library:2.1.3'
     implementation 'com.chabbal:slidingdotsplash:1.0.2'
-    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation 'com.google.code.gson:gson:2.8.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
-    implementation 'com.google.android.gms:play-services:11.8.0'
-    implementation 'com.google.android.gms:play-services-location:11.8.0'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 
-    //implementation 'com.getbase:floatingactionbutton:1.10.1'
     implementation 'com.github.clans:fab:1.6.4'
 
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 
-    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.picasso:picasso:2.71828'
 
-    implementation 'com.pushwoosh:pushwoosh:4.6.2'
-    implementation 'com.squareup.retrofit2:retrofit:2.1.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
+    implementation 'com.pushwoosh:pushwoosh:5.20.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
+    implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
 
     implementation 'com.jakewharton:butterknife:10.2.0'
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
 
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
@@ -88,24 +86,24 @@ dependencies {
     implementation 'noman.weekcalendar:weekcalendar:1.0.6'
 
     // maps
-    implementation 'com.google.android.gms:play-services-maps:16.0.0'
-    implementation 'com.google.android.gms:play-services-places:16.0.0'
-    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
+    implementation 'com.google.android.gms:play-services-places:17.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
 
     // firebase
-    implementation 'com.google.firebase:firebase-core:16.0.4'
-    implementation 'com.google.firebase:firebase-firestore:17.1.1'
-    implementation 'com.google.firebase:firebase-messaging:17.3.3'
+    implementation 'com.google.firebase:firebase-core:17.2.1'
+    implementation 'com.google.firebase:firebase-firestore:21.3.0'
+    implementation 'com.google.firebase:firebase-messaging:20.0.1'
     implementation 'com.firebase:firebase-jobdispatcher:0.7.0'
-    implementation 'com.google.firebase:firebase-config:16.1.0'
+    implementation 'com.google.firebase:firebase-config:19.0.3'
 
     // dagger 2
-    implementation 'com.google.dagger:dagger:2.17'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.17'
+    implementation 'com.google.dagger:dagger:2.25.2'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
 
     // lombok
-    compileOnly 'org.projectlombok:lombok:1.18.2'
-    annotationProcessor 'org.projectlombok:lombok:1.18.2'
+    compileOnly 'org.projectlombok:lombok:1.18.10'
+    annotationProcessor 'org.projectlombok:lombok:1.18.10'
 
     // MaterialShowcaseView for spotlight
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
@@ -113,13 +111,15 @@ dependencies {
     // Required -- JUnit 4 framework
     testImplementation 'junit:junit:4.12'
     // Optional -- Mockito framework
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:3.1.0'
 
     // Navigation for UI
     def nav_version = "2.1.0"
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
 
+    // Pushwoosh
+    implementation 'com.pushwoosh:pushwoosh:5.20.0'
 }
 apply plugin: 'com.google.gms.google-services'
 apply plugin: "androidx.navigation.safeargs"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bb937455..0df8eaec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -170,11 +169,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <service android:name=".utilities.MyFirebaseInstanceIDService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
-            </intent-filter>
-        </service>
 
         <activity
             android:name=".domain.main.CalendarActivity"
diff --git a/app/src/main/java/com/asuc/asucmobile/domain/fragments/MapsFragment.java b/app/src/main/java/com/asuc/asucmobile/domain/fragments/MapsFragment.java
index 8a4e4d34..6ac910ed 100644
--- a/app/src/main/java/com/asuc/asucmobile/domain/fragments/MapsFragment.java
+++ b/app/src/main/java/com/asuc/asucmobile/domain/fragments/MapsFragment.java
@@ -534,10 +534,10 @@ public void onMapReady(GoogleMap googleMap) {
             public void onMapClick(LatLng latLng) {
                 if (originWrapper == null || busRouteWrapper == null || navigation_button == null) {
                     originWrapper = (LinearLayout) layout.findViewById(R.id.origin_bar);
-                    navigation_button = (com.google.android.material.floatingactionbutton.FloatingActionButton) layout.findViewById(R.id.determinate);
+                    navigation_button = layout.findViewById(R.id.determinate);
 
                 }
-                navigation_button.setVisibility(View.VISIBLE);
+                navigation_button.show();
                 hideKeyboard(mapView);
                 clearFocus();
             }
diff --git a/app/src/main/java/com/asuc/asucmobile/domain/main/PushReceiver.java b/app/src/main/java/com/asuc/asucmobile/domain/main/PushReceiver.java
index e0877af0..d1b6f530 100644
--- a/app/src/main/java/com/asuc/asucmobile/domain/main/PushReceiver.java
+++ b/app/src/main/java/com/asuc/asucmobile/domain/main/PushReceiver.java
@@ -5,37 +5,30 @@
 import android.content.Intent;
 import android.util.Log;
 
-import com.pushwoosh.PushManager;
+import com.pushwoosh.Pushwoosh;
 
 public class PushReceiver extends BroadcastReceiver {
 
     private static final String TAG = "PushReceiver";
 
-    private static PushManager manager;
-
     /*
      * This method is called when the phone boots
      */
     @Override
     public void onReceive(Context context, Intent intent) {
-        // Register for push notifications
-        registerPushes(context);
-    }
-
-    public static void registerPushes(Context context) {
-        // If we already registered, deregister then re-register
-        if (manager != null) {
-            return;
-        }
-
-        // Start PushWhoosh
-        manager = PushManager.getInstance(context);
-        try {
-            manager.onStartup(context);
-            manager.registerForPushNotifications();
-        } catch (Exception e) {
-            Log.e(TAG, e.toString());
+        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+            // Register for push notifications
+            Pushwoosh.getInstance().registerForPushNotifications(result -> {
+                if (result.isSuccess()) {
+                    Log.d(TAG, "Successfully registered for push notifications with token: "
+                            + result.getData());
+                } else {
+                    if (result.getException() != null) {
+                        Log.d(TAG, "Failed to register for push notifications: "
+                                + result.getException().getMessage());
+                    }
+                }
+            });
         }
     }
-
 }
diff --git a/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseInstanceIDService.java b/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseInstanceIDService.java
deleted file mode 100644
index 3fdfe2be..00000000
--- a/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseInstanceIDService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.asuc.asucmobile.utilities;
-
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import android.util.Log;
-
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.FirebaseInstanceIdService;
-
-
-public class MyFirebaseInstanceIDService extends FirebaseInstanceIdService {
-
-    private static final String TAG = "MyFirebaseIIDService";
-
-    /**
-     * Called if InstanceID token is updated. This may occur if the security of
-     * the previous token had been compromised. Note that this is called when the InstanceID token
-     * is initially generated so this is where you would retrieve the token.
-     */
-    // [START refresh_token]
-    @Override
-    public void onTokenRefresh() {
-        // Get updated InstanceID token.
-        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
-        Log.d(TAG, "Refreshed token: " + refreshedToken);
-
-        // If you want to send messages to this application instance or
-        // manage this apps subscriptions on the server side, send the
-        // Instance ID token to your app server.
-        sendRegistrationToServer(refreshedToken);
-    }
-    // [END refresh_token]
-
-    /**
-     * NOTE: This feature is not momentarily used
-     *
-     * Persist token to third-party servers.
-     *
-     * Modify this method to associate the user's FCM InstanceID token with any server-side account
-     * maintained by your application.
-     *
-     * @param token The new token.
-     */
-    private void sendRegistrationToServer(String token) {
-        // TODO: Implement this method to send token to your app server.
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseMessagingService.java b/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseMessagingService.java
index 3b2e9f9b..c0f7634d 100644
--- a/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseMessagingService.java
+++ b/app/src/main/java/com/asuc/asucmobile/utilities/MyFirebaseMessagingService.java
@@ -108,7 +108,4 @@ private void sendNotification(String messageBody) {
         NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
         mNotificationManager.notify(MESSAGE_ID++, mBuilder.build());
     }
-
-
-
 }
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index ff6288d8..ad1794f0 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -30,8 +30,7 @@
         tools:context="com.androidsample.BottomSheetActivity">
         <include layout="@layout/bottom_sheet" />
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout
-        >
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <RelativeLayout
         android:id="@+id/topBox"
diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml
index 6a42889e..6db7d188 100644
--- a/app/src/main/res/layout/fragment_calendar.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -10,7 +10,6 @@
         android:id="@+id/list"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/toolbar"
         />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>