diff --git a/scp/android/app/build.gradle b/scp/android/app/build.gradle
index e0942c5..7b7e3ab 100644
--- a/scp/android/app/build.gradle
+++ b/scp/android/app/build.gradle
@@ -13,12 +13,12 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 //if (flutterVersionCode == null) {
-    flutterVersionCode = '37'
+    flutterVersionCode = '41'
 //}
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 //if (flutterVersionName == null) {
-    flutterVersionName = '3.7'
+    flutterVersionName = '4.1'
 //}
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
diff --git a/scp/lib/HomePage.dart b/scp/lib/HomePage.dart
index e2ef6aa..a278e69 100644
--- a/scp/lib/HomePage.dart
+++ b/scp/lib/HomePage.dart
@@ -35,6 +35,7 @@ class _HomePageState extends State<HomePage> {
   RemoteConfig remoteConfig;
   bool isChat = false;
   String chatUrl;
+  bool isAutumn;
   int buildNumber;
   int publishVersion;
 
@@ -375,28 +376,37 @@ class _HomePageState extends State<HomePage> {
       await remoteConfig.fetch(expiration: const Duration(seconds: 0));
       await remoteConfig.activateFetched();
       isChat = remoteConfig.getBool('is_chat_active');
+
       chatUrl = remoteConfig.getString('chatLink');
+      isAutumn = remoteConfig.getBool('is_autumn');
+
       publishVersion = int.parse(remoteConfig.getString("version"));
+      print(publishVersion);
       await prefs.setBool('is_chat_active', isChat);
       await prefs.setString('chatLink', chatUrl);
+      await prefs.setBool('is_autumn', isAutumn);
     } on FetchThrottledException catch (exception) {
       isChat = prefs.getBool('is_chat_active');
       chatUrl = prefs.getString('chatLink');
+      isAutumn = prefs.getBool('is_autumn');
       // Fetch throttled.
       print(exception);
     } catch (exception) {
       isChat = prefs.getBool('is_chat_active');
       chatUrl = prefs.getString('chatLink');
+      isAutumn = prefs.getBool('is_autumn');
     }
 
     isChat = remoteConfig.getBool('is_chat_active');
     chatUrl = remoteConfig.getString('chatLink');
     username = prefs.getString('username');
+    isAutumn = prefs.getBool('is_autumn');
     rollNo = prefs.getString('roll_no');
     phoneNo = prefs.getString('phone_no');
     await prefs.setBool('hasBooked', prefs.getBool('hasBooked') ?? false);
-    print(username + rollNo + phoneNo);
+    print(username + rollNo + phoneNo + isAutumn.toString());
     reset();
+
     print(
         "Version number is $buildNumber and version on remote config is $publishVersion");
     if (buildNumber < publishVersion) {}
diff --git a/scp/lib/appointments.dart b/scp/lib/appointments.dart
index 2c19561..680e75a 100644
--- a/scp/lib/appointments.dart
+++ b/scp/lib/appointments.dart
@@ -142,7 +142,7 @@ class _AppointmentsState extends State<Appointments> {
     psychName = remoteConfig.getString('psych_name');
     psychDay = remoteConfig.getString('psych_day');
     print(counselDay + 'hola');
-    await scpDatabase.init(); // TODO: Makeshift
+    await scpDatabase.init();
     _onCounselChangedSubscription =
         ScpDatabase.counselRef.onChildChanged.listen(_onSlotsUpdated);
     _onPsychChangedSubscription =
diff --git a/scp/lib/attendance_tracker.dart b/scp/lib/attendance_tracker.dart
index d2009c9..ecae792 100644
--- a/scp/lib/attendance_tracker.dart
+++ b/scp/lib/attendance_tracker.dart
@@ -130,11 +130,11 @@ class _AttendanceTrackerState extends State<AttendanceTracker> {
 
   @override
   Widget build(BuildContext context) {
-    List<String> items(DateTime day) {
+    Future<List<String>> items() async {
       List<String> subList = [];
       if (theory.toString() == "Ar.")
         subList = arch;
-      else if (TimeTableResources.isAutumnSemester()) {
+      else if (await TimeTableResources.isAutumnSem()) {
         if (theory.toString() == "A" ||
             theory.toString() == "B" ||
             theory.toString() == "C" ||
@@ -194,192 +194,218 @@ class _AttendanceTrackerState extends State<AttendanceTracker> {
             )
           ],
         ),
-        body: Container(
-          padding: EdgeInsets.symmetric(horizontal: 16.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: <Widget>[
-              TableCalendar(
-                events: _events,
-                initialSelectedDay: DateTime.now(),
-                calendarController: _calendarController,
-                initialCalendarFormat: CalendarFormat.month,
-                onDaySelected: (day, events, holidays) {
-                  setState(() {
-                    markedValue = items(day)[0];
-                    currentDay = day;
-                    _selectedEvents = events;
-                  });
-                },
-                builders: CalendarBuilders(
-                    selectedDayBuilder: (context, date, events) {
-                  return RaisedButton(
-                      elevation: 4.0,
-                      child: Text(
-                        date.day.toString(),
-                        style: TextStyle(
-                            color: primaryColor,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 12),
-                      ),
-                      color: secondaryColor,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(12.0),
-                      ),
-                      onPressed: () {});
-                }),
-                calendarStyle: CalendarStyle(
-                    canEventMarkersOverflow: true,
-                    todayColor: primaryColor,
-                    selectedColor: secondaryColor,
-                    markersColor: primaryColor,
-                    markersMaxAmount: 4,
-                    todayStyle: TextStyle(
-                        color: Colors.white,
-                        fontFamily: 'PfDin',
-                        fontSize: 16,
-                        fontWeight: FontWeight.bold)),
-                headerStyle: HeaderStyle(
-                  titleTextStyle:
-                      TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
-                  centerHeaderTitle: true,
-                  formatButtonVisible: false,
-                  headerMargin: EdgeInsets.all(8.0),
-                ),
-              ),
-              SizedBox(
-                height: 10,
-              ),
-              (currentDay.weekday <= 5)
-                  ? Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                      children: <Widget>[
-                        DropdownButton<String>(
-                            icon: Icon(Icons.keyboard_arrow_down),
-                            iconSize: 16,
-                            elevation: 10,
+        body: FutureBuilder(
+          future: items(),
+          builder:
+              (BuildContext context, AsyncSnapshot<List<String>> snapshot) {
+            if (snapshot.connectionState != ConnectionState.done) {
+              return CircularProgressIndicator();
+            }
+            return Container(
+              padding: EdgeInsets.symmetric(horizontal: 16.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: <Widget>[
+                  TableCalendar(
+                    events: _events,
+                    initialSelectedDay: DateTime.now(),
+                    calendarController: _calendarController,
+                    initialCalendarFormat: CalendarFormat.month,
+                    onDaySelected: (day, events, holidays) {
+                      setState(() async {
+                        markedValue = snapshot.data[0];
+                        currentDay = day;
+                        _selectedEvents = events;
+                      });
+                    },
+                    builders: CalendarBuilders(
+                        selectedDayBuilder: (context, date, events) {
+                      return RaisedButton(
+                          elevation: 4.0,
+                          child: Text(
+                            date.day.toString(),
                             style: TextStyle(
-                              color: primaryColor,
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                            ),
-                            onChanged: (value) {
-                              setState(() {
-                                markedValue = value;
-                              });
-                            },
-                            value: markedValue,
-                            items: items(currentDay).map((entry) {
-                              return DropdownMenuItem(
-                                  value: entry,
-                                  child: Text(
-                                    entry,
-                                    style: TextStyle(color: primaryColor),
-                                  ));
-                            }).toList()),
-                        RaisedButton(
-                            elevation: 10,
-                            color: primaryColor,
-                            textColor: Colors.white,
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(18.0),
-                            ),
-                            child: Text("Enter"),
-                            onPressed: () {
-                              setState(() {
-                                if (_absents.containsKey(markedValue)) {
-                                  _absents[markedValue.toString()]++;
-                                } else {
-                                  _absents[markedValue.toString()] = 1;
-                                }
-                                if (_selectedEvents.contains(markedValue)) {
-                                  print(markedValue + " 1");
-                                  return;
-                                } else {
-                                  if (_events[
-                                          _calendarController.selectedDay] !=
-                                      null) {
-                                    print(markedValue + " b");
-                                    _selectedEvents.add(markedValue);
-                                    _events[_calendarController.selectedDay]
-                                        .add(markedValue);
-                                  } else {
-                                    print(markedValue + " a");
-                                    _selectedEvents.add(markedValue);
-                                    _events[_calendarController.selectedDay] = [
-                                      markedValue
-                                    ];
-                                  }
-                                }
-                                print(_selectedEvents);
-                                pref.setString('absents',
-                                    json.encode(encodeAbs(_absents)));
-                                pref.setString(
-                                    'events', json.encode(encodeMap(_events)));
-                              });
-                            }),
-                        IconButton(
-                            icon: Icon(
-                              Icons.delete,
-                              color: primaryColor,
-                            ),
-                            onPressed: () {
-                              setState(() {
-                                for (String selectClass in _selectedEvents) {
-                                  if (_absents.containsKey(selectClass)) {
-                                    _absents[selectClass]--;
-                                  }
-                                }
-                                _selectedEvents.clear();
-                                _events[_calendarController.selectedDay]
-                                    .clear();
-                                print(_selectedEvents);
-                              });
-                            })
-                      ],
-                    )
-                  : Container(),
-              (currentDay.weekday <= 5)
-                  ? Container(
-                      padding: EdgeInsets.only(top: 24.0, bottom: 16.0),
-                      child: Text(
-                        "Here are the classes you missed ",
-                        textAlign: TextAlign.start,
-                        style: TextStyle(
-                            fontWeight: FontWeight.w900,
-                            fontSize: 24,
-                            color: primaryColor),
-                      ),
-                    )
-                  : Container(),
-              (_selectedEvents.length != null && currentDay.weekday <= 5)
-                  ? SingleChildScrollView(
-                      child: ListView.builder(
-                        scrollDirection: Axis.vertical,
-                        shrinkWrap: true,
-                        itemCount: _selectedEvents.length,
-                        itemBuilder: (context, index) {
-                          return Padding(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: 24.0, vertical: 8.0),
-                            child: SizedBox(
-                              height: 16,
-                              child: Text(
-                                _selectedEvents[index] +
-                                    " - " +
-                                    _absents[_selectedEvents[index]].toString(),
-                                style: TextStyle(
-                                    fontWeight: FontWeight.bold,
-                                    color: primaryColor),
+                                color: primaryColor,
+                                fontWeight: FontWeight.bold,
+                                fontSize: 12),
+                          ),
+                          color: secondaryColor,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(12.0),
+                          ),
+                          onPressed: () {});
+                    }),
+                    calendarStyle: CalendarStyle(
+                        canEventMarkersOverflow: true,
+                        todayColor: primaryColor,
+                        selectedColor: secondaryColor,
+                        markersColor: primaryColor,
+                        markersMaxAmount: 4,
+                        todayStyle: TextStyle(
+                            color: Colors.white,
+                            fontFamily: 'PfDin',
+                            fontSize: 16,
+                            fontWeight: FontWeight.bold)),
+                    headerStyle: HeaderStyle(
+                      titleTextStyle: TextStyle(
+                          fontSize: 16.0, fontWeight: FontWeight.bold),
+                      centerHeaderTitle: true,
+                      formatButtonVisible: false,
+                      headerMargin: EdgeInsets.all(8.0),
+                    ),
+                  ),
+                  SizedBox(
+                    height: 10,
+                  ),
+                  (currentDay.weekday <= 5)
+                      ? Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          children: <Widget>[
+                            Expanded(
+                              flex: 6,
+                              child: Container(
+                                child: DropdownButton<String>(
+                                    icon: Icon(Icons.keyboard_arrow_down),
+                                    iconSize: 16,
+                                    elevation: 10,
+                                    style: TextStyle(
+                                      color: primaryColor,
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                    onChanged: (value) {
+                                      setState(() {
+                                        markedValue = value;
+                                      });
+                                    },
+                                    value: markedValue,
+                                    items: snapshot.data.map((entry) {
+                                      return DropdownMenuItem(
+                                          value: entry,
+                                          child: Container(
+                                            child: Text(
+                                              entry,
+                                              style: TextStyle(
+                                                  color: primaryColor),
+                                            ),
+                                          ));
+                                    }).toList()),
                               ),
                             ),
-                          );
-                        },
-                      ),
-                    )
-                  : Container()
-            ],
-          ),
+                            Expanded(
+                              flex: 2,
+                              child: RaisedButton(
+                                  elevation: 10,
+                                  color: primaryColor,
+                                  textColor: Colors.white,
+                                  shape: RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(18.0),
+                                  ),
+                                  child: Text("Enter"),
+                                  onPressed: () {
+                                    setState(() {
+                                      if (_absents.containsKey(markedValue)) {
+                                        _absents[markedValue.toString()]++;
+                                      } else {
+                                        _absents[markedValue.toString()] = 1;
+                                      }
+                                      if (_selectedEvents
+                                          .contains(markedValue)) {
+                                        print(markedValue + " 1");
+                                        return;
+                                      } else {
+                                        if (_events[_calendarController
+                                                .selectedDay] !=
+                                            null) {
+                                          print(markedValue + " b");
+                                          _selectedEvents.add(markedValue);
+                                          _events[_calendarController
+                                                  .selectedDay]
+                                              .add(markedValue);
+                                        } else {
+                                          print(markedValue + " a");
+                                          _selectedEvents.add(markedValue);
+                                          _events[_calendarController
+                                              .selectedDay] = [markedValue];
+                                        }
+                                      }
+                                      print(_selectedEvents);
+                                      pref.setString('absents',
+                                          json.encode(encodeAbs(_absents)));
+                                      pref.setString('events',
+                                          json.encode(encodeMap(_events)));
+                                    });
+                                  }),
+                            ),
+                            Expanded(
+                              flex: 1,
+                              child: IconButton(
+                                  icon: Icon(
+                                    Icons.delete,
+                                    color: primaryColor,
+                                  ),
+                                  onPressed: () {
+                                    setState(() {
+                                      for (String selectClass
+                                          in _selectedEvents) {
+                                        if (_absents.containsKey(selectClass)) {
+                                          _absents[selectClass]--;
+                                        }
+                                      }
+                                      _selectedEvents.clear();
+                                      _events[_calendarController.selectedDay]
+                                          .clear();
+                                      print(_selectedEvents);
+                                    });
+                                  }),
+                            )
+                          ],
+                        )
+                      : Container(),
+                  (currentDay.weekday <= 5)
+                      ? Container(
+                          padding: EdgeInsets.only(top: 24.0, bottom: 16.0),
+                          child: Text(
+                            "Here are the classes you missed ",
+                            textAlign: TextAlign.start,
+                            style: TextStyle(
+                                fontWeight: FontWeight.w900,
+                                fontSize: 24,
+                                color: primaryColor),
+                          ),
+                        )
+                      : Container(),
+                  (_selectedEvents.length != null && currentDay.weekday <= 5)
+                      ? SingleChildScrollView(
+                          child: ListView.builder(
+                            scrollDirection: Axis.vertical,
+                            shrinkWrap: true,
+                            itemCount: _selectedEvents.length,
+                            itemBuilder: (context, index) {
+                              return Padding(
+                                padding: const EdgeInsets.symmetric(
+                                    horizontal: 24.0, vertical: 8.0),
+                                child: SizedBox(
+                                  height: 16,
+                                  child: Text(
+                                    _selectedEvents[index] +
+                                        " - " +
+                                        _absents[_selectedEvents[index]]
+                                            .toString(),
+                                    style: TextStyle(
+                                        fontWeight: FontWeight.bold,
+                                        color: primaryColor),
+                                  ),
+                                ),
+                              );
+                            },
+                          ),
+                        )
+                      : Container()
+                ],
+              ),
+            );
+          },
         ),
       ),
     );
diff --git a/scp/lib/login.dart b/scp/lib/login.dart
index 54b0366..187a629 100644
--- a/scp/lib/login.dart
+++ b/scp/lib/login.dart
@@ -38,7 +38,7 @@ class _LoginState extends State<Login> {
     var textScaleFactor = MediaQuery.of(context).textScaleFactor;
     countryCodeController.text = countryCode;
     return Scaffold(
-      resizeToAvoidBottomPadding: false,
+      resizeToAvoidBottomInset: false,
       backgroundColor: Colors.white,
       body: Stack(
         children: <Widget>[
@@ -194,7 +194,7 @@ class _LoginState extends State<Login> {
                     style: TextStyle(
                       fontWeight: FontWeight.w400,
                       fontFamily: 'PfDin',
-                      fontSize: SizeConfig.screenWidth*0.047,
+                      fontSize: SizeConfig.screenWidth * 0.047,
                     ),
                   ),
                   textColor: Colors.white,
diff --git a/scp/lib/time_table.dart b/scp/lib/time_table.dart
index d65cc16..ddb9379 100644
--- a/scp/lib/time_table.dart
+++ b/scp/lib/time_table.dart
@@ -32,7 +32,7 @@ class TimeTableState extends State<TimeTable> {
     prefs.getKeys();
     theorySection = prefs.getString('theory_section');
     practicalSection = prefs.getString('prac_section');
-    bool isAutumnSemester = TimeTableResources.isAutumnSemester();
+    bool isAutumnSemester = await TimeTableResources.isAutumnSem();
     if ((theorySection.compareTo('Ar.') == 0) ||
         (theorySection.compareTo('A') == 0) ||
         (theorySection.compareTo('D') == 0) ||
diff --git a/scp/lib/time_table_resources.dart b/scp/lib/time_table_resources.dart
index 39898b9..f0e26ca 100644
--- a/scp/lib/time_table_resources.dart
+++ b/scp/lib/time_table_resources.dart
@@ -1,8 +1,16 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
 abstract class TimeTableResources {
-  static bool isAutumnSemester() => true;
+  static Future<bool> isAutumnSem() async {
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    prefs.getKeys();
+    return prefs.getBool('is_autumn');
+  }
+
+  //static bool isAutumnSemester() => true;
   static String courseNumber = 'I';
-  static void setCourseNumber() {
-    courseNumber = isAutumnSemester() ? 'I' : 'II';
+  static void setCourseNumber() async {
+    courseNumber = await isAutumnSem() ? 'I' : 'II';
     theory['A']['TA'] = theory['B']['TA'] = theory['C']['TB'] =
         theory['D']['TB'] = theory['E']['TK'] = theory['F']['TK'] =
             theory['G']['TM'] = theory['H']['TM'] = 'Physics-$courseNumber';
diff --git a/scp/lib/ui/background.dart b/scp/lib/ui/background.dart
index d7418ba..b07e0ca 100644
--- a/scp/lib/ui/background.dart
+++ b/scp/lib/ui/background.dart
@@ -4,7 +4,7 @@ class Background extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      resizeToAvoidBottomPadding: false,
+      resizeToAvoidBottomInset: false,
       backgroundColor: Colors.white,
       body: Column(
         children: <Widget>[
@@ -15,8 +15,7 @@ class Background extends StatelessWidget {
             ],
           ),
           Expanded(
-            child: Container(
-            ),
+            child: Container(),
           ),
           Stack(
             alignment: Alignment.bottomLeft,
@@ -34,12 +33,12 @@ class Background extends StatelessWidget {
 
 const List<Color> aquaGradients = [
   Color.fromRGBO(107, 195, 145, 1.0),
-      Color.fromRGBO(8, 121, 191, 1.0),
+  Color.fromRGBO(8, 121, 191, 1.0),
 ];
 
 const List<Color> blueGradients = [
   Color.fromRGBO(48, 72, 142, 1.0),
-      Color.fromRGBO(0, 173, 239, 1.0),
+  Color.fromRGBO(0, 173, 239, 1.0),
 ];
 
 class WavyHeader extends StatelessWidget {
@@ -170,4 +169,4 @@ class YellowCircleClipper extends CustomClipper<Rect> {
 
   @override
   bool shouldReclip(CustomClipper<Rect> oldClipper) => false;
-}
\ No newline at end of file
+}
diff --git a/scp/lib/ui/cards.dart b/scp/lib/ui/cards.dart
index 191f3eb..f44db10 100644
--- a/scp/lib/ui/cards.dart
+++ b/scp/lib/ui/cards.dart
@@ -2,8 +2,8 @@ import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:scp/booking.dart';
-import 'package:scp/mentor_search/mentee_page.dart';
-import 'package:scp/mentor_search/mentor_page.dart';
+import 'package:scp/ui/views/mentor_search/mentee_page.dart';
+import 'package:scp/ui/views/mentor_search/mentor_page.dart';
 import 'package:scp/ui/gradients.dart';
 import 'package:scp/firebase/firebaseDBHandler.dart';
 import 'package:scp/utils/routes.dart';
diff --git a/scp/lib/Appointments/appointments_view.dart b/scp/lib/ui/views/Appointments/appointments_view.dart
similarity index 100%
rename from scp/lib/Appointments/appointments_view.dart
rename to scp/lib/ui/views/Appointments/appointments_view.dart
diff --git a/scp/lib/Appointments/appointments_viewmodel.dart b/scp/lib/ui/views/Appointments/appointments_viewmodel.dart
similarity index 100%
rename from scp/lib/Appointments/appointments_viewmodel.dart
rename to scp/lib/ui/views/Appointments/appointments_viewmodel.dart
diff --git a/scp/lib/homePage/homePage_view.dart b/scp/lib/ui/views/homePage/homePage_view.dart
similarity index 100%
rename from scp/lib/homePage/homePage_view.dart
rename to scp/lib/ui/views/homePage/homePage_view.dart
diff --git a/scp/lib/homePage/homePage_view_model.dart b/scp/lib/ui/views/homePage/homePage_view_model.dart
similarity index 99%
rename from scp/lib/homePage/homePage_view_model.dart
rename to scp/lib/ui/views/homePage/homePage_view_model.dart
index e5bf181..2290d33 100644
--- a/scp/lib/homePage/homePage_view_model.dart
+++ b/scp/lib/ui/views/homePage/homePage_view_model.dart
@@ -3,7 +3,7 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:scp/dateConfig.dart';
 import 'package:intl/intl.dart';
-import '../main.dart';
+import 'package:scp/main.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:package_info/package_info.dart';
 import 'package:rate_my_app/rate_my_app.dart';
diff --git a/scp/lib/mentor_search/mentee_page.dart b/scp/lib/ui/views/mentor_search/mentee_page.dart
similarity index 99%
rename from scp/lib/mentor_search/mentee_page.dart
rename to scp/lib/ui/views/mentor_search/mentee_page.dart
index 96e6b11..09fd36c 100644
--- a/scp/lib/mentor_search/mentee_page.dart
+++ b/scp/lib/ui/views/mentor_search/mentee_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
-import '../utils/grapgQLconfig.dart';
+import 'package:scp/utils/grapgQLconfig.dart';
 
 final Color primaryColor = Color.fromARGB(255, 49, 68, 76);
 final Color secondaryColor = Color.fromARGB(255, 158, 218, 224);
diff --git a/scp/lib/mentor_search/mentee_page_view.dart b/scp/lib/ui/views/mentor_search/mentee_page_view.dart
similarity index 92%
rename from scp/lib/mentor_search/mentee_page_view.dart
rename to scp/lib/ui/views/mentor_search/mentee_page_view.dart
index 18447a8..7f3b2b6 100644
--- a/scp/lib/mentor_search/mentee_page_view.dart
+++ b/scp/lib/ui/views/mentor_search/mentee_page_view.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
-import 'package:scp/mentor_search/mentee_page_viewmodel.dart';
+import 'package:scp/ui/views/mentor_search/mentee_page_viewmodel.dart';
 import 'package:stacked/stacked.dart';
-import '../utils/grapgQLconfig.dart';
 
 final Color primaryColor = Color.fromARGB(255, 49, 68, 76);
 final Color secondaryColor = Color.fromARGB(255, 158, 218, 224);
@@ -54,15 +53,15 @@ class ListDetails extends StatelessWidget {
         ),
       ),
       body: ViewModelBuilder.reactive(
-          builder: (context, model, child) {
-            if (model.isBusy())
-              return CircularProgressIndicator();
-            else
-              return MenteeDetails(model);
-          },
-          viewModelBuilder: () => MenteePageViewModel(rollNo),
-          onModelReady: (model)=>model.init(),
-          ),
+        builder: (context, model, child) {
+          if (model.isBusy())
+            return CircularProgressIndicator();
+          else
+            return MenteeDetails(model);
+        },
+        viewModelBuilder: () => MenteePageViewModel(rollNo),
+        onModelReady: (model) => model.init(),
+      ),
     );
   }
 }
diff --git a/scp/lib/mentor_search/mentee_page_viewmodel.dart b/scp/lib/ui/views/mentor_search/mentee_page_viewmodel.dart
similarity index 100%
rename from scp/lib/mentor_search/mentee_page_viewmodel.dart
rename to scp/lib/ui/views/mentor_search/mentee_page_viewmodel.dart
diff --git a/scp/lib/mentor_search/mentor_page.dart b/scp/lib/ui/views/mentor_search/mentor_page.dart
similarity index 99%
rename from scp/lib/mentor_search/mentor_page.dart
rename to scp/lib/ui/views/mentor_search/mentor_page.dart
index 65752d6..1c7bd4b 100644
--- a/scp/lib/mentor_search/mentor_page.dart
+++ b/scp/lib/ui/views/mentor_search/mentor_page.dart
@@ -3,7 +3,7 @@ import 'package:graphql_flutter/graphql_flutter.dart';
 
 import 'package:url_launcher/url_launcher.dart';
 import 'package:native_contact_dialog/native_contact_dialog.dart';
-import '../utils/grapgQLconfig.dart';
+import 'package:scp/utils/grapgQLconfig.dart';
 
 final Color primaryColor = Color.fromARGB(255, 49, 68, 76);
 final Color secondaryColor = Color.fromARGB(255, 158, 218, 224);
diff --git a/scp/lib/userdata.dart b/scp/lib/userdata.dart
index 9404b7a..0f6e30e 100644
--- a/scp/lib/userdata.dart
+++ b/scp/lib/userdata.dart
@@ -31,7 +31,7 @@ class UserdataState extends State<Userdata> {
     var textScaleFactor = MediaQuery.of(context).textScaleFactor;
     _fetchUserData(context);
     return Scaffold(
-      resizeToAvoidBottomPadding: true,
+      resizeToAvoidBottomInset: true,
       appBar: AppBar(
           backgroundColor: Color.fromRGBO(25, 39, 45, 1),
           title: Text(
diff --git a/scp/lib/utils/routes.dart b/scp/lib/utils/routes.dart
index b1de39f..2457daa 100644
--- a/scp/lib/utils/routes.dart
+++ b/scp/lib/utils/routes.dart
@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:scp/Appointments/appointments_view.dart';
 import 'package:scp/HomePage.dart';
-
 import 'package:scp/booking.dart';
 import 'package:scp/chat.dart';
 import 'package:scp/drawer_screens/about_scs.dart';
@@ -9,7 +7,6 @@ import 'package:scp/drawer_screens/dev_info.dart';
 import 'package:scp/drawer_screens/important_documents.dart';
 import 'package:scp/drawer_screens/notifications/notifications_view.dart';
 import 'package:scp/drawer_screens/settings.dart';
-import 'package:scp/homePage/homePage_view.dart';
 import 'package:scp/login.dart';
 import 'package:scp/timetable/theorySection.dart';
 import 'package:scp/appointments.dart';
@@ -32,8 +29,8 @@ class Routes {
 
   static Map<String, WidgetBuilder> getRoutes() {
     return {
-      Routes.rHomepage: (context) => HomeView(),
-      Routes.rAppointments: (context) => AppointmentView(),
+      Routes.rHomepage: (context) => HomePage(),
+      Routes.rAppointments: (context) => Appointments(),
       Routes.rTimetable: (context) => TheorySection(0), //0 for left card
       Routes.rUserData: (context) => Userdata(),
       Routes.rLogin: (context) => Login(),