diff --git a/elaichi/.gitignore b/elaichi/.gitignore
index 2d31149f..593ad30f 100644
--- a/elaichi/.gitignore
+++ b/elaichi/.gitignore
@@ -16,6 +16,8 @@ doc/api/
 # If you don't generate coverage info locally you can remove this line.
 coverage/
 
+test/.test_coverage.dart
+
 # Avoid committing generated Javascript files:
 *.dart.js
 *.info.json      # Produced by the --dump-info flag.
diff --git a/elaichi/android/app/build.gradle b/elaichi/android/app/build.gradle
index c689f653..2de9cf85 100644
--- a/elaichi/android/app/build.gradle
+++ b/elaichi/android/app/build.gradle
@@ -24,6 +24,7 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+apply plugin: 'com.google.gms.google-services'
 
 def keyStoreProperties = new Properties()
 def keyStorePropertiesFile = rootProject.file('key.properties')
diff --git a/elaichi/android/app/src/main/AndroidManifest.xml b/elaichi/android/app/src/main/AndroidManifest.xml
index 33400217..1ddf2b0d 100644
--- a/elaichi/android/app/src/main/AndroidManifest.xml
+++ b/elaichi/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dscnitrourkela.elaichi">
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/elaichi/android/build.gradle b/elaichi/android/build.gradle
index 3100ad2d..9319192f 100644
--- a/elaichi/android/build.gradle
+++ b/elaichi/android/build.gradle
@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 
diff --git a/elaichi/assets/icons/avenue_icons.ttf b/elaichi/assets/icons/avenue_icons.ttf
new file mode 100644
index 00000000..47addb1d
Binary files /dev/null and b/elaichi/assets/icons/avenue_icons.ttf differ
diff --git a/elaichi/assets/images/dsc.png b/elaichi/assets/images/dsc.png
deleted file mode 100644
index fa57321c..00000000
Binary files a/elaichi/assets/images/dsc.png and /dev/null differ
diff --git a/elaichi/assets/translations/en.json b/elaichi/assets/translations/en.json
index 14f25f3e..4b359918 100644
--- a/elaichi/assets/translations/en.json
+++ b/elaichi/assets/translations/en.json
@@ -3,5 +3,6 @@
     "welcome": "Welcome to NITR Central",
     "homeTitle": "Your Feed",
     "timeTable": "Timetable",
-    "openCalendar": "Open Calendar"
+    "openCalendar": "Open Calendar",
+    "thisWeekTitle": "Stories This Week"
 }
diff --git a/elaichi/lib/app/colors.dart b/elaichi/lib/app/colors.dart
index 2a6a9a08..2da6be24 100644
--- a/elaichi/lib/app/colors.dart
+++ b/elaichi/lib/app/colors.dart
@@ -18,6 +18,7 @@ class AppColors {
   static const Color darkAnnouncementDocBackground =
       Color.fromRGBO(238, 109, 109, 0.05);
   static const Color unselectedIconColor = Color.fromRGBO(196, 196, 196, 1.0);
+  static const Color cardHeader = Color.fromRGBO(79, 79, 79, 1.0);
 
   //icons
   static const Color calendarIcon = Color.fromRGBO(47, 128, 237, 1.0);
diff --git a/elaichi/lib/app/icons.dart b/elaichi/lib/app/icons.dart
new file mode 100644
index 00000000..ac7ff220
--- /dev/null
+++ b/elaichi/lib/app/icons.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/widgets.dart';
+
+/// Contains all custom icons used in the app.
+class AppIcons {
+  AppIcons._();
+
+  static const _kAvenueFont = 'Avenue';
+
+  /// Monday Morning icon data.
+  static const IconData mmIcon = IconData(0xe500, fontFamily: _kAvenueFont);
+
+  /// Feed icon for BottomNavigationBar.
+  static const IconData feed = IconData(0xe902, fontFamily: _kAvenueFont);
+
+  /// Explore icon for BottomNavigationBar.
+  static const IconData explore = IconData(0xe901, fontFamily: _kAvenueFont);
+
+  /// Campus icon for BottomNavigationBar.
+  static const IconData campus = IconData(0xe900, fontFamily: _kAvenueFont);
+}
diff --git a/elaichi/lib/app/locator.config.dart b/elaichi/lib/app/locator.config.dart
index 1ade8565..acef915c 100644
--- a/elaichi/lib/app/locator.config.dart
+++ b/elaichi/lib/app/locator.config.dart
@@ -11,7 +11,6 @@ import 'package:stacked_themes/stacked_themes.dart';
 
 import '../services/api.dart';
 import '../services/fake_api.dart';
-import '../services/feed_service.dart';
 import '../services/local_db.dart';
 import '../services/third_party_services_module.dart';
 
@@ -30,7 +29,6 @@ GetIt $initGetIt(
   final thirdPartyServicesModule = _$ThirdPartyServicesModule();
   gh.lazySingleton<Api>(() => FakeApi(), registerFor: {_dev});
   gh.lazySingleton<DialogService>(() => thirdPartyServicesModule.dialogService);
-  gh.lazySingleton<FeedService>(() => FeedService());
   gh.lazySingleton<NavigationService>(
       () => thirdPartyServicesModule.navigationService);
   gh.lazySingleton<SnackbarService>(
diff --git a/elaichi/lib/app/styles.dart b/elaichi/lib/app/styles.dart
index cc08efc2..9daa8262 100644
--- a/elaichi/lib/app/styles.dart
+++ b/elaichi/lib/app/styles.dart
@@ -17,8 +17,11 @@ class TextStyles {
       fontSize: 16.0, fontWeight: FontWeight.w600, height: 1.225);
 
   /// Used in Smaller section headers, TabBar, subject/event title in schedule.
-  static TextStyle get heading2 =>
-      const TextStyle(fontSize: 14.0, height: 1.4, fontWeight: FontWeight.w600);
+  static TextStyle get heading2 => const TextStyle(
+      fontSize: 14.0,
+      height: 1.4,
+      fontWeight: FontWeight.w600,
+      color: AppColors.bodyText);
 
   /// Used for Bold/grey/colored text paired with body1, course code/club,
   /// time name in schedule, desgination of club members
diff --git a/elaichi/lib/datamodels/api_models.dart b/elaichi/lib/datamodels/api_models.dart
index d76cc25a..5647feac 100644
--- a/elaichi/lib/datamodels/api_models.dart
+++ b/elaichi/lib/datamodels/api_models.dart
@@ -2,6 +2,8 @@
 
 import 'package:flutter/widgets.dart';
 
+import 'user.dart';
+
 class Club {
   ///
   Club(
@@ -72,25 +74,6 @@ class Event {
   final String picture;
 }
 
-/// Defines data model for login response.
-class LoginResponse {
-  /// Creates an instance of [LoginResponse].
-  LoginResponse({
-    this.success = true,
-    this.userId,
-    this.message,
-  });
-
-  /// The boolean value specifying if login was successful.
-  final bool success;
-
-  /// The firebase user ID.
-  final String userId;
-
-  /// The error/success message.
-  final String message;
-}
-
 ///
 class ScheduleEvent {
   ///
@@ -106,5 +89,3 @@ class ScheduleEvent {
   final String title;
   final String contact;
 }
-
-class User {}
diff --git a/elaichi/lib/datamodels/datamodels.dart b/elaichi/lib/datamodels/datamodels.dart
new file mode 100644
index 00000000..e0e7618f
--- /dev/null
+++ b/elaichi/lib/datamodels/datamodels.dart
@@ -0,0 +1,6 @@
+library datamodels;
+
+export 'api_models.dart';
+export 'auth_user.dart';
+export 'data.dart';
+export 'user.dart';
diff --git a/elaichi/lib/generated/codegen_loader.g.dart b/elaichi/lib/generated/codegen_loader.g.dart
index d1ec50ec..e8d52cd1 100644
--- a/elaichi/lib/generated/codegen_loader.g.dart
+++ b/elaichi/lib/generated/codegen_loader.g.dart
@@ -19,7 +19,8 @@ class CodegenLoader extends AssetLoader{
   "welcome": "Welcome to NITR Central",
   "homeTitle": "Your Feed",
   "timeTable": "Timetable",
-  "openCalendar": "Open Calendar"
+  "openCalendar": "Open Calendar",
+  "thisWeekTitle": "Stories This Week"
 };
 static const Map<String, Map<String,dynamic>> mapLocales = {"en": en};
 }
diff --git a/elaichi/lib/generated/locale_keys.g.dart b/elaichi/lib/generated/locale_keys.g.dart
index da8f016c..1c98e3be 100644
--- a/elaichi/lib/generated/locale_keys.g.dart
+++ b/elaichi/lib/generated/locale_keys.g.dart
@@ -6,5 +6,6 @@ abstract class  LocaleKeys {
   static const homeTitle = 'homeTitle';
   static const timeTable = 'timeTable';
   static const openCalendar = 'openCalendar';
+  static const thisWeekTitle = 'thisWeekTitle';
 
 }
diff --git a/elaichi/lib/graphql/schema.graphql b/elaichi/lib/graphql/schema.graphql
new file mode 100644
index 00000000..b4e2a08c
--- /dev/null
+++ b/elaichi/lib/graphql/schema.graphql
@@ -0,0 +1,230 @@
+directive @cacheControl(
+  maxAge: Int
+  scope: CacheControlScope
+) on FIELD_DEFINITION | OBJECT | INTERFACE
+# Exposes a URL that specifies the behaviour of this scalar.
+directive @specifiedBy(
+  # The URL that specifies the behaviour of this scalar.
+  url: String!
+) on SCALAR
+type AccessLevel {
+  id: ID
+  level: String
+  name: String
+  relation: String
+  club: Club
+  user: User
+}
+
+input AccessLevelInputType {
+  level: String
+  name: String
+  relation: String
+  club: ID
+  user: ID
+}
+
+type ActiveStory {
+  id: ID
+  assetType: String
+  storyAsset: String
+  authorName: String
+  authorLogo: String
+}
+
+enum CacheControlScope {
+  PUBLIC
+  PRIVATE
+}
+
+type Club {
+  id: ID
+  clubName: String
+  memberAccess: [AccessLevel]
+  facAd: String
+  logo: String
+  events: [Event]
+  society: String
+  domain: String
+}
+
+input ClubInputType {
+  clubName: String
+  memberAccess: [AccessLevelInputType]
+  facAd: String
+  logo: String
+  events: [ID]
+  society: String
+  domain: String
+}
+
+# A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the
+# `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO
+# 8601 standard for representation of dates and times using the Gregorian calendar.
+scalar DateTime
+
+type Error {
+  code: String
+  message: String
+  token: String
+}
+
+type ErrorClass {
+  message: String!
+  code: String!
+}
+
+type Event {
+  id: ID
+  organizer: Club
+  eventName: String
+  startDateTime: String
+  venue: Venue
+  endDateTime: String
+  registrationPrice: Int
+  registrationCount: Int
+  otherDescription: String
+  attendees: [User]
+  announcements: String
+  link: String
+  picture: String
+}
+
+input EventInputType {
+  organizer: ID
+  eventName: String
+  startDateTime: String
+  venue: ID
+  endDateTime: String
+  registrationPrice: Int
+  registrationCount: Int
+  otherDescription: String
+  attendees: [ID]
+  announcements: String
+  link: String
+  picture: String
+}
+
+type Mutation {
+  authUser(user: UserInputType): User
+  updateUser(user: UserInputType): User
+  deleteUser(id: ID): User
+  addEvent(event: EventInputType): Event
+  updateEvent(id: ID, event: EventInputType): Event
+  deleteEvent(id: ID): Event
+  addClub(club: ClubInputType): Club
+  updateClub(id: ID, club: ClubInputType): Club
+  deleteClub(id: ID): Club
+  addVenue(venue: VenueInputType): Venue
+  updateVenue(id: ID, venue: VenueInputType): Venue
+  deleteVenue(id: ID): Venue
+  addStory(story: StoryInputType): StoryResult
+}
+
+type Query {
+  users(
+    name: String
+    username: String
+    gmailAuthMail: String
+    instituteId: String
+    mobile: String
+    emergencyContact: String
+  ): [UserResult]
+  userByUsername(username: String): UserResult
+  userById(id: String): UserResult
+  events(
+    id: ID
+    eventName: String
+    facAd: String
+    logo: String
+    society: String
+    domain: String
+  ): [Event]
+  eventByName(name: String): Event
+  eventById(id: String): Event
+  clubs(
+    id: ID
+    clubName: String
+    facAd: String
+    logo: String
+    society: String
+    domain: String
+  ): [Club]
+  clubByName(name: String): Club
+  clubById(id: String): Club
+  venues(venue: VenueInputType): [Venue]
+  venueByName(name: String): Venue
+  venueById(id: String): Venue
+  currentStories: [ActiveStory]
+  storiesByField(
+    id: ID
+    author: ID
+    event: ID
+    asset: String
+    assetType: String
+    description: String
+  ): [Story]
+  deleteStory(id: ID): Response
+}
+
+type Response {
+  success: Boolean
+}
+
+type Story {
+  id: ID
+  author: Club
+  event: Event
+  asset: String
+  assetType: String
+  description: String
+  createdAt: DateTime
+}
+
+input StoryInputType {
+  author: ID
+  event: ID
+  asset: String
+  assetType: String
+  description: String
+}
+
+union StoryResult = Story | ErrorClass
+# The `Upload` scalar type represents a file upload.
+scalar Upload
+
+type User {
+  id: ID
+  name: String
+  username: String
+  gmailAuthMail: String
+  clubAccess: [AccessLevel]
+  instituteId: String
+  mobile: String
+  emergencyContact: String
+  displayPicture: String
+}
+
+input UserInputType {
+  name: String
+  username: String
+  gmailAuthMail: String
+  instituteId: String
+  mobile: String
+  emergencyContact: String
+  displayPicture: String
+}
+
+union UserOrError = User | Error
+union UserResult = User | ErrorClass
+type Venue {
+  id: ID
+  name: String
+  description: String
+}
+
+input VenueInputType {
+  name: String
+  description: String
+}
+
diff --git a/elaichi/lib/main.dart b/elaichi/lib/main.dart
index 2c586866..081d04c3 100644
--- a/elaichi/lib/main.dart
+++ b/elaichi/lib/main.dart
@@ -5,6 +5,7 @@ import 'package:elaichi/app/themes/base_theme.dart';
 import 'package:elaichi/generated/codegen_loader.g.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
 import 'package:elaichi/ui/utils/no_over_scroll.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -18,6 +19,7 @@ Future<void> main() async {
     final license = await rootBundle.loadString('fonts/OFL.txt');
     yield LicenseEntryWithLineBreaks(['google_fonts'], license);
   });
+  await Firebase.initializeApp();
   Logger.level = Level.debug;
   setupLocator(environment: Env.dev);
   WidgetsFlutterBinding.ensureInitialized();
diff --git a/elaichi/lib/services/api.dart b/elaichi/lib/services/api.dart
index a6e93180..5c3ad445 100644
--- a/elaichi/lib/services/api.dart
+++ b/elaichi/lib/services/api.dart
@@ -1,17 +1,7 @@
 import 'package:elaichi/datamodels/api_models.dart';
-import 'package:flutter/foundation.dart';
 
 /// Defines the interface used by the API services.
 abstract class Api {
-  /// Provides interface for login functionality.
-  /// The parameters [username] and [password] must be non-null.
-  Future<LoginResponse> login(
-      {@required String username, @required String password});
-
-  /// Provides interface for getting user details.
-  /// The parameter [userId] must be non null.
-  Future<String> getUser(String userId, {int errorMode = 0});
-
   /// Provides interface for getting current stories.
   Future<List<CurrentStory>> getCurrentStories();
 
diff --git a/elaichi/lib/services/fake_api.dart b/elaichi/lib/services/fake_api.dart
index 56251637..0fd7ff17 100644
--- a/elaichi/lib/services/fake_api.dart
+++ b/elaichi/lib/services/fake_api.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:elaichi/app/locator.dart';
 import 'package:elaichi/datamodels/api_models.dart';
 import 'package:elaichi/services/api.dart';
@@ -10,64 +9,6 @@ import 'package:injectable/injectable.dart';
 
 @LazySingleton(as: Api, env: [Env.dev])
 class FakeApi implements Api {
-  /// Mocks an user API call.
-  ///
-  /// The optional integer parameter [errorMode] can be utilised to return
-  /// errors.
-  /// It is 0 by default.
-  ///
-  /// The following errors are available in the function call:
-  ///
-  /// * 0 -> No error(default)
-  ///
-  /// * 1 -> Throws a [SocketException] to simulate internet connection error.
-  ///
-  /// * 2 -> Throws an HttpExcepiton to simulate an Http error.
-  ///
-  /// * 3 -> Returns invalid JSON string that leads to a [FormatException].
-  @override
-  Future<String> getUser(String userId, {int errorMode = 0}) async {
-    await Future.delayed(const Duration(seconds: 1));
-
-    switch (errorMode) {
-      case 1:
-        throw const SocketException('No internet connection');
-        break;
-      case 2:
-        throw const HttpException('User not found');
-        break;
-      case 3:
-        return 'abcd';
-        break;
-      case 0:
-        if (userId == 'test') {
-          return '''
-            {
-              "userId":"test",
-              "name":"John Doe",
-              "email":"john.doe@example.com"
-            }''';
-        } else {
-          return null;
-        }
-        break;
-      default:
-        return null;
-    }
-  }
-
-  @override
-  Future<LoginResponse> login({String username, String password}) async {
-    await Future.delayed(const Duration(seconds: 1));
-
-    if (username == 'test') {
-      return LoginResponse(
-          userId: 'test', message: 'Login successful for user: $username');
-    }
-
-    return LoginResponse(success: false, message: 'Login unsuccesful');
-  }
-
   @override
   Future<List<CurrentStory>> getCurrentStories() {
     final story = CurrentStory(
diff --git a/elaichi/lib/services/feed_service.dart b/elaichi/lib/services/feed_service.dart
deleted file mode 100644
index f3a41ad8..00000000
--- a/elaichi/lib/services/feed_service.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// ignore_for_file: public_member_api_docs
-
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:elaichi/app/failure.dart';
-import 'package:elaichi/app/locator.dart';
-// import 'package:elaichi/datamodels/api_models.dart';
-import 'package:elaichi/datamodels/user.dart';
-import 'package:elaichi/services/api.dart';
-import 'package:injectable/injectable.dart';
-
-@lazySingleton
-class FeedService {
-  final Api _apiClient = locator<Api>();
-
-  Future<User> getUser() async {
-    try {
-      final user = await _apiClient.getUser('test');
-      return User.fromMap(json.decode(user));
-    } on SocketException {
-      throw Failure(0, 'No Internet Connection');
-    } on HttpException {
-      throw Failure(1, 'Could not find user');
-    } on FormatException {
-      throw Failure(2, 'Bad Response Format');
-    }
-  }
-}
\ No newline at end of file
diff --git a/elaichi/lib/services/services.dart b/elaichi/lib/services/services.dart
new file mode 100644
index 00000000..75207dbc
--- /dev/null
+++ b/elaichi/lib/services/services.dart
@@ -0,0 +1,8 @@
+library services;
+
+export 'api.dart';
+export 'auth.dart';
+export 'fake_api.dart';
+export 'graphql.dart';
+export 'local_db.dart';
+export 'third_party_services_module.dart';
diff --git a/elaichi/lib/ui/utils/utils.dart b/elaichi/lib/ui/utils/utils.dart
new file mode 100644
index 00000000..7bcf4d96
--- /dev/null
+++ b/elaichi/lib/ui/utils/utils.dart
@@ -0,0 +1,3 @@
+library utils;
+
+export 'no_over_scroll.dart';
diff --git a/elaichi/lib/ui/views/feed/feed_view.dart b/elaichi/lib/ui/views/feed/feed_view.dart
index cd22a05c..f03799af 100644
--- a/elaichi/lib/ui/views/feed/feed_view.dart
+++ b/elaichi/lib/ui/views/feed/feed_view.dart
@@ -2,21 +2,26 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
 import 'package:elaichi/ui/views/feed/feed_viewmodel.dart';
 import 'package:elaichi/ui/widgets/appbar.dart';
+import 'package:elaichi/ui/widgets/event_card.dart';
 import 'package:elaichi/ui/widgets/schedule/schedule_card.dart';
 import 'package:elaichi/ui/widgets/story/story_bar.dart';
+import 'package:elaichi/ui/widgets/this_week.dart';
 import 'package:flutter/material.dart';
 import 'package:stacked/stacked.dart';
 
 /// Landing feed page.
 class FeedView extends StatelessWidget {
-  /// Constructor for [FeedView]
-  const FeedView({Key key}) : super(key: key);
+  /// Constructor for [FeedView].
+  const FeedView({Key key, this.model}) : super(key: key);
+
+  /// Optional viewModel instance, used for tests.
+  final FeedViewModel model;
 
   @override
   Widget build(BuildContext context) {
     return ViewModelBuilder<FeedViewModel>.reactive(
-      viewModelBuilder: () => FeedViewModel(),
-      onModelReady: (FeedViewModel model) => model.initialise(),
+      viewModelBuilder: () => model ?? FeedViewModel(),
+      onModelReady: (FeedViewModel model) async => await model.initialise(),
       builder: (BuildContext context, FeedViewModel model, Widget child) {
         return SafeArea(
           child: Scaffold(
@@ -25,13 +30,16 @@ class FeedView extends StatelessWidget {
               appbarHeight: 76,
             ),
             body: model.isBusy
-                ? const Center(
-                    child: CircularProgressIndicator(),
-                  )
+                ? const Center(child: CircularProgressIndicator())
                 : ListView(
                     children: <Widget>[
                       const StoryBar(),
+                      const SizedBox(
+                        height: 7.52,
+                      ),
                       const ScheduleCard(),
+                      const ThisWeek(),
+                      const EventCard(),
                     ],
                   ),
           ),
diff --git a/elaichi/lib/ui/views/feed/feed_viewmodel.dart b/elaichi/lib/ui/views/feed/feed_viewmodel.dart
index daa440f4..c2dc3bc9 100644
--- a/elaichi/lib/ui/views/feed/feed_viewmodel.dart
+++ b/elaichi/lib/ui/views/feed/feed_viewmodel.dart
@@ -18,10 +18,9 @@ class FeedViewModel extends BaseViewModel {
   Either<Failure, List<ScheduleEvent>> get scheduleEvents => _scheduleEvents;
 
   /// Calls the required functions to initialise the view model.
-  void initialise() async {
+  Future<void> initialise() async {
     setBusy(true);
-    // Future.wait([fetchCurrentStories(), getSchedule()]);
-    await fetchCurrentStories();
+    await Future.wait([fetchCurrentStories(), getSchedule()]);
     setBusy(false);
   }
 
diff --git a/elaichi/lib/ui/views/home/home_view.dart b/elaichi/lib/ui/views/home/home_view.dart
index c61e1eed..3d4ae9ca 100644
--- a/elaichi/lib/ui/views/home/home_view.dart
+++ b/elaichi/lib/ui/views/home/home_view.dart
@@ -1,4 +1,6 @@
 import 'package:elaichi/app/colors.dart';
+import 'package:elaichi/app/icons.dart';
+import 'package:elaichi/app/styles.dart';
 import 'package:elaichi/ui/views/feed/feed_view.dart';
 import 'package:elaichi/ui/views/home/home_viewmodel.dart';
 import 'package:flutter/material.dart';
@@ -17,24 +19,41 @@ class HomeView extends StatelessWidget {
       disposeViewModel: false,
       builder: (context, model, child) => Scaffold(
         bottomNavigationBar: BottomNavigationBar(
-          currentIndex: model.currentIndex,
           type: BottomNavigationBarType.fixed,
+          currentIndex: model.currentIndex,
           onTap: model.setIndex,
+          selectedLabelStyle: TextStyles.subtitle,
           selectedItemColor: AppColors.bodyText,
           unselectedItemColor: AppColors.overlineText,
           items: const [
             BottomNavigationBarItem(
-                label: 'Feed', icon: Icon(Icons.dynamic_feed)),
+              label: 'Feed',
+              icon: Icon(
+                AppIcons.feed,
+              ),
+            ),
+            BottomNavigationBarItem(
+              label: 'Explore',
+              icon: Icon(
+                AppIcons.explore,
+              ),
+            ),
             BottomNavigationBarItem(
-                label: 'Explore', icon: Icon(Icons.explore)),
+              label: 'Campus',
+              icon: Icon(
+                AppIcons.campus,
+              ),
+            ),
             BottomNavigationBarItem(
-                label: 'Profile', icon: Icon(Icons.account_circle)),
+              label: 'Profile',
+              icon: Icon(Icons.account_circle_outlined),
+            ),
           ],
         ),
         body: SafeArea(
           child: IndexedStack(
             index: model.currentIndex,
-            children: const [FeedView(), FeedView(), FeedView()],
+            children: const [FeedView(), FeedView(), FeedView(), FeedView()],
           ),
         ),
       ),
diff --git a/elaichi/lib/ui/views/home/home_viewmodel.dart b/elaichi/lib/ui/views/home/home_viewmodel.dart
index 7fb8e6e4..f55c2bcc 100644
--- a/elaichi/lib/ui/views/home/home_viewmodel.dart
+++ b/elaichi/lib/ui/views/home/home_viewmodel.dart
@@ -1,60 +1,11 @@
-import 'package:dartz/dartz.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:elaichi/app/failure.dart';
-import 'package:elaichi/app/locator.dart';
-import 'package:elaichi/datamodels/user.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
-import 'package:elaichi/services/feed_service.dart';
 import 'package:stacked/stacked.dart';
 
 /// ViewModel class for HomeView
 class HomeViewModel extends IndexTrackingViewModel {
-  String _title = LocaleKeys.welcome.tr();
+  final String _title = LocaleKeys.welcome.tr();
 
-  /// Returns [_title] followed by [_counter].
+  /// Returns welcome message.
   String get title => _title;
-
-  // Counter example using stacked.
-  int _counter = 0;
-
-  /// Returns [_counter] value.
-  int get counter => _counter;
-
-  Either<Failure, User> _user;
-
-  /// Returns the value of [_user]. It can be either an instance of [Failure]
-  /// or an instance of [User].
-  ///
-  /// Use following syntax to fold the value and work with it:
-  /// ```dart
-  ///   model.user.fold(
-  ///     (failure) => Text(failure.toString()), // first argument is [Failure]
-  ///     (user) => Text(user.toString())
-  ///   );
-  /// ```
-  Either<Failure, User> get user => _user;
-
-  final FeedService _feedService = locator<FeedService>();
-
-  /// Called when '+' button is tapped on HomeView.
-  void updateCounter() {
-    _counter++;
-    notifyListeners();
-  }
-
-  void _setUser(Either<Failure, User> user) {
-    _user = user;
-    notifyListeners();
-  }
-
-  /// Fetches user info from API
-  Future fetchUser() async {
-    setBusy(true);
-    await Task(_feedService.getUser)
-        .attempt()
-        .map((either) => either.leftMap((obj) => obj as Failure))
-        .run()
-        .then(_setUser);
-    setBusy(false);
-  }
 }
diff --git a/elaichi/lib/ui/views/startup/startup_viewmodel.dart b/elaichi/lib/ui/views/startup/startup_viewmodel.dart
index 57a6380c..d7508638 100644
--- a/elaichi/lib/ui/views/startup/startup_viewmodel.dart
+++ b/elaichi/lib/ui/views/startup/startup_viewmodel.dart
@@ -10,7 +10,7 @@ import 'package:stacked_themes/stacked_themes.dart';
 class StartupViewModel extends BaseViewModel {
   /// [Logger] for [StartupViewModel].
   final Logger log = getLogger('StartupViewModel');
-  String _title = 'Click on the forward button to view the home page';
+  final String _title = 'Click on the forward button to view the home page';
 
   final ThemeService _themeService = locator<ThemeService>();
 
diff --git a/elaichi/lib/ui/widgets/appbar.dart b/elaichi/lib/ui/widgets/appbar.dart
index 99783113..3908e285 100644
--- a/elaichi/lib/ui/widgets/appbar.dart
+++ b/elaichi/lib/ui/widgets/appbar.dart
@@ -1,5 +1,5 @@
+import 'package:elaichi/app/styles.dart';
 import 'package:flutter/material.dart';
-import 'package:elaichi/app/extensions.dart';
 
 /// Themed appbar widget for the app.
 class ElaichiAppbar extends StatelessWidget with PreferredSizeWidget {
@@ -35,12 +35,7 @@ class ElaichiAppbar extends StatelessWidget with PreferredSizeWidget {
     return AppBar(
       title: Text(
         title,
-        style: context.textTheme.headline6.copyWith(
-            fontWeight: FontWeight.bold,
-            fontStyle: FontStyle.normal,
-            letterSpacing: -0.02,
-            height: 1.21,
-            fontSize: 22.0),
+        style: TextStyles.title,
       ),
       toolbarHeight: appbarHeight,
       backgroundColor: backgroundColor,
diff --git a/elaichi/lib/ui/widgets/event_card.dart b/elaichi/lib/ui/widgets/event_card.dart
new file mode 100644
index 00000000..8c6f7915
--- /dev/null
+++ b/elaichi/lib/ui/widgets/event_card.dart
@@ -0,0 +1,92 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:elaichi/app/styles.dart';
+import 'package:elaichi/ui/widgets/widgets.dart';
+import 'package:flutter/material.dart';
+
+/// Widget for upcoming events UI.
+class EventCard extends StatelessWidget {
+  /// Constructor for EventCard.
+  const EventCard({Key key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16.0),
+      child: AspectRatio(
+        aspectRatio: 410 / 260,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Flexible(
+              flex: 2,
+              fit: FlexFit.tight,
+              child: Padding(
+                padding: const EdgeInsets.only(left: 29.0, top: 25),
+                child: Text('Upcoming Events', style: TextStyles.heading1),
+              ),
+            ),
+            Flexible(
+              flex: 6,
+              child: ListView.builder(
+                scrollDirection: Axis.horizontal,
+                itemCount: 5,
+                itemBuilder: (context, index) => AspectRatio(
+                  aspectRatio: 155 / 200,
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 12.0, right: 6.0),
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(6.0),
+                      child: Stack(
+                        fit: StackFit.expand,
+                        children: [
+                          CachedNetworkImage(
+                            imageUrl: 'https://i.ibb.co/R9NBqPr/sanitizer.jpg',
+                            fit: BoxFit.cover,
+                          ),
+                          Container(
+                            child: Align(
+                              alignment: const Alignment(0.0, 0.7),
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                children: [
+                                  const StoryComponent(
+                                    width: 39,
+                                    height: 39,
+                                    unviewedBorderColor: Colors.white,
+                                  ),
+                                  const SizedBox(height: 7.5),
+                                  Text(
+                                    'DSC NITR',
+                                    style: TextStyles.subtitle
+                                        .copyWith(color: Colors.white),
+                                  ),
+                                  const SizedBox(height: 10),
+                                ],
+                              ),
+                            ),
+                            decoration: BoxDecoration(
+                              gradient: LinearGradient(
+                                colors: [
+                                  Colors.black.withOpacity(1),
+                                  Colors.black.withOpacity(0)
+                                ],
+                                begin: FractionalOffset.bottomCenter,
+                                end: FractionalOffset.topCenter,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/elaichi/lib/ui/widgets/schedule/schedule_card.dart b/elaichi/lib/ui/widgets/schedule/schedule_card.dart
index fd0f2a5b..eeeecf51 100644
--- a/elaichi/lib/ui/widgets/schedule/schedule_card.dart
+++ b/elaichi/lib/ui/widgets/schedule/schedule_card.dart
@@ -1,3 +1,4 @@
+import 'package:elaichi/app/styles.dart';
 import 'package:elaichi/generated/locale_keys.g.dart';
 import 'package:elaichi/ui/views/feed/feed_viewmodel.dart';
 import 'package:elaichi/ui/widgets/schedule/schedule_component.dart';
@@ -15,55 +16,57 @@ class ScheduleCard extends ViewModelWidget<FeedViewModel> {
 
   @override
   Widget build(BuildContext context, FeedViewModel viewModel) {
-    return AspectRatio(
-      aspectRatio: 410 / 240,
-      child: Column(
-        children: [
-          Flexible(
-            fit: FlexFit.tight,
-            child: Row(
-              children: [
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.only(left: 29.0),
-                    child: Text(
-                      LocaleKeys.timeTable.tr(),
-                      textAlign: TextAlign.left,
-                      style: context.textTheme.bodyText1,
+    return Container(
+      color: context.theme.colorScheme.surface,
+      child: AspectRatio(
+        aspectRatio: 410 / 240,
+        child: Column(
+          children: [
+            Flexible(
+              fit: FlexFit.tight,
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 29.0),
+                      child: Text(LocaleKeys.timeTable.tr(),
+                          textAlign: TextAlign.left,
+                          style: TextStyles.heading1),
                     ),
                   ),
-                ),
-                FlatButton.icon(
-                  onPressed: () {},
-                  label: Text(LocaleKeys.openCalendar.tr(),
-                      style: context.textTheme.bodyText1),
-                  icon: const Icon(
-                    Icons.arrow_forward_ios,
-                    size: 14,
-                    color: Colors.black,
+                  FlatButton.icon(
+                    onPressed: () {},
+                    label: Text(LocaleKeys.openCalendar.tr(),
+                        style:
+                            TextStyles.heading2.copyWith(color: Colors.blue)),
+                    icon: const Icon(
+                      Icons.arrow_forward_ios,
+                      size: 14,
+                      color: Colors.blue,
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
-          ),
-          Flexible(
-            flex: 3,
-            child: viewModel.scheduleEvents.fold(
-              (failure) => Text(failure.toString()),
-              (scheduleEvents) => ListView.builder(
-                shrinkWrap: true,
-                scrollDirection: Axis.horizontal,
-                itemCount: scheduleEvents.length,
-                itemBuilder: (context, index) => ScheduleComponent(
-                  contact: scheduleEvents[index].contact,
-                  time: scheduleEvents[index].time,
-                  title: scheduleEvents[index].title,
-                  identifier: scheduleEvents[index].identifier,
+            Flexible(
+              flex: 3,
+              child: viewModel.scheduleEvents.fold(
+                (failure) => Text(failure.toString()),
+                (scheduleEvents) => ListView.builder(
+                  shrinkWrap: true,
+                  scrollDirection: Axis.horizontal,
+                  itemCount: scheduleEvents.length,
+                  itemBuilder: (context, index) => ScheduleComponent(
+                    contact: scheduleEvents[index].contact,
+                    time: scheduleEvents[index].time,
+                    title: scheduleEvents[index].title,
+                    identifier: scheduleEvents[index].identifier,
+                  ),
                 ),
               ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
diff --git a/elaichi/lib/ui/widgets/schedule/schedule_component.dart b/elaichi/lib/ui/widgets/schedule/schedule_component.dart
index 2d8020c7..00bfb1c5 100644
--- a/elaichi/lib/ui/widgets/schedule/schedule_component.dart
+++ b/elaichi/lib/ui/widgets/schedule/schedule_component.dart
@@ -1,5 +1,6 @@
+import 'package:elaichi/app/colors.dart';
+import 'package:elaichi/app/styles.dart';
 import 'package:flutter/material.dart';
-import 'package:elaichi/app/extensions.dart';
 
 /// Schedule event widget.
 class ScheduleComponent extends StatelessWidget {
@@ -41,37 +42,27 @@ class ScheduleComponent extends StatelessWidget {
                 borderRadius: BorderRadius.circular(8.0)),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
               children: <Widget>[
                 Flexible(
                   fit: FlexFit.tight,
                   flex: 2,
                   child: Text(
                     time,
-                    style: context.textTheme.bodyText1.copyWith(
-                        fontWeight: FontWeight.w600, height: 1.4, fontSize: 12),
+                    style: TextStyles.subtitle,
                   ),
                 ),
-                Flexible(
-                  fit: FlexFit.tight,
-                  child: Text(
-                    identifier,
-                    style: context.textTheme.caption.copyWith(
-                      fontSize: 12,
-                      height: 1.4,
-                    ),
-                  ),
+                Text(
+                  identifier,
+                  style: TextStyles.subtitle
+                      .copyWith(color: AppColors.bodyText.withOpacity(0.6)),
                 ),
                 Flexible(
                   fit: FlexFit.tight,
                   flex: 4,
                   child: Text(
                     title,
-                    style: context.textTheme.headline6.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      height: 1.4,
-                      letterSpacing: -0.02,
-                    ),
+                    style: TextStyles.heading2,
                   ),
                 ),
                 Flexible(
@@ -81,7 +72,8 @@ class ScheduleComponent extends StatelessWidget {
                     contact,
                     overflow: TextOverflow.ellipsis,
                     maxLines: 2,
-                    style: context.textTheme.bodyText1.copyWith(fontSize: 14),
+                    style: TextStyles.subtitle
+                        .copyWith(fontWeight: FontWeight.w400),
                   ),
                 )
               ],
diff --git a/elaichi/lib/ui/widgets/story/story_bar.dart b/elaichi/lib/ui/widgets/story/story_bar.dart
index 0b61d1bf..9510a481 100644
--- a/elaichi/lib/ui/widgets/story/story_bar.dart
+++ b/elaichi/lib/ui/widgets/story/story_bar.dart
@@ -21,7 +21,12 @@ class StoryBar extends ViewModelWidget<FeedViewModel> {
             scrollDirection: Axis.horizontal,
             itemCount: currentStories.length,
             itemBuilder: (BuildContext context, int index) {
-              return StoryComponent(story: currentStories[index]);
+              return StoryComponent(
+                story: currentStories[index],
+                height: 66.0,
+                width: 66.0,
+                borderWidth: 4.0,
+              );
             },
           ),
         ),
diff --git a/elaichi/lib/ui/widgets/story/story_component.dart b/elaichi/lib/ui/widgets/story/story_component.dart
index d5ae4ca3..f0ea1cf4 100644
--- a/elaichi/lib/ui/widgets/story/story_component.dart
+++ b/elaichi/lib/ui/widgets/story/story_component.dart
@@ -1,3 +1,4 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:elaichi/app/config/size_config.dart';
 import 'package:elaichi/datamodels/api_models.dart';
 import 'package:flutter/material.dart';
@@ -5,21 +6,60 @@ import 'package:flutter/material.dart';
 /// Cirular story widget.
 class StoryComponent extends StatelessWidget {
   /// Constructor for [StoryComponent].
-  const StoryComponent({Key key, this.story}) : super(key: key);
+  const StoryComponent(
+      {Key key,
+      this.story,
+      @required this.height,
+      @required this.width,
+      this.viewedBorderColor = Colors.white,
+      this.unviewedBorderColor = Colors.blue,
+      this.borderWidth = 2.0})
+      : super(key: key);
 
   /// Data for [StoryComponent].
   final CurrentStory story;
 
+  /// Height of the circle container of [StoryComponent].
+  final double height;
+
+  /// Width of the circle container of [StoryComponent].
+  final double width;
+
+  /// Color of the border when the story/component has been viewed.
+  final Color viewedBorderColor;
+
+  /// Color of the border when the story/component has not been viewed.
+  final Color unviewedBorderColor;
+
+  /// Border width of [StoryComponent].
+  final double borderWidth;
+
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(horizontal: Margins(context.display).small),
-      child: const CircleAvatar(
-        backgroundColor: Colors.transparent,
-        backgroundImage: AssetImage(
-          'assets/images/dsc.png',
+      margin: EdgeInsets.symmetric(horizontal: Margins(context.display).small),
+      decoration: const BoxDecoration(
+          shape: BoxShape.circle,
+          gradient: LinearGradient(
+              colors: [
+                Color.fromRGBO(0, 88, 219, 1),
+                Color.fromRGBO(0, 163, 255, 1)
+              ],
+              begin: FractionalOffset.bottomCenter,
+              end: FractionalOffset.topCenter)),
+      child: Container(
+        height: height,
+        width: width,
+        margin: const EdgeInsets.symmetric(horizontal: 4.0),
+        padding: EdgeInsets.symmetric(
+            horizontal: Margins(context.display).small - 4),
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          shape: BoxShape.circle,
+        ),
+        child: CachedNetworkImage(
+          imageUrl: 'https://i.ibb.co/Ltgq2C3/dsc.png',
         ),
-        radius: 40.0,
       ),
     );
   }
diff --git a/elaichi/lib/ui/widgets/this_week.dart b/elaichi/lib/ui/widgets/this_week.dart
new file mode 100644
index 00000000..0fda0a14
--- /dev/null
+++ b/elaichi/lib/ui/widgets/this_week.dart
@@ -0,0 +1,93 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:elaichi/app/icons.dart';
+import 'package:elaichi/app/styles.dart';
+import 'package:elaichi/generated/locale_keys.g.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+
+/// Widget for current week's Monday Morning articles.
+class ThisWeek extends StatelessWidget {
+  /// Constructor for ThisWeek.
+  const ThisWeek({Key key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AspectRatio(
+      aspectRatio: 410 / 260,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Flexible(
+            fit: FlexFit.tight,
+            child: Row(
+              children: [
+                const Padding(
+                  padding: EdgeInsets.only(left: 29.0),
+                  child: Icon(
+                    AppIcons.mmIcon,
+                    size: 30,
+                  ),
+                ),
+                Expanded(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                    child: Text(LocaleKeys.thisWeekTitle.tr(),
+                        style: TextStyles.heading1),
+                  ),
+                )
+              ],
+            ),
+          ),
+          Flexible(
+            flex: 3,
+            child: ListView.builder(
+              scrollDirection: Axis.horizontal,
+              itemCount: 3,
+              itemBuilder: (context, index) => AspectRatio(
+                aspectRatio: 16 / 9.68,
+                child: Padding(
+                  padding: const EdgeInsets.only(left: 12.0, right: 6.0),
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(10.0),
+                    child: Stack(
+                      fit: StackFit.expand,
+                      children: [
+                        CachedNetworkImage(
+                            imageUrl: 'https://i.ibb.co/R9NBqPr/sanitizer.jpg',
+                            fit: BoxFit.cover),
+                        Container(
+                          child: Align(
+                            alignment: const Alignment(0.0, 0.7),
+                            child: Text(
+                              '''
+A Noble Breakthrough: NIT Rourkela produces alcohol-based sanitizers''',
+                              textAlign: TextAlign.center,
+                              style: TextStyles.heading2.copyWith(
+                                  color: Colors.white,
+                                  fontWeight: FontWeight.w700),
+                            ),
+                          ),
+                          decoration: BoxDecoration(
+                            gradient: LinearGradient(
+                              colors: [
+                                Colors.black.withOpacity(1),
+                                Colors.black.withOpacity(0)
+                              ],
+                              begin: FractionalOffset.bottomLeft,
+                              end: FractionalOffset.topRight,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
diff --git a/elaichi/lib/ui/widgets/widgets.dart b/elaichi/lib/ui/widgets/widgets.dart
new file mode 100644
index 00000000..b56cbd13
--- /dev/null
+++ b/elaichi/lib/ui/widgets/widgets.dart
@@ -0,0 +1,7 @@
+library widgets;
+
+export 'appbar.dart';
+export 'schedule/schedule_card.dart';
+export 'schedule/schedule_component.dart';
+export 'story/story_bar.dart';
+export 'story/story_component.dart';
diff --git a/elaichi/pubspec.yaml b/elaichi/pubspec.yaml
index e307224f..34bdaf59 100644
--- a/elaichi/pubspec.yaml
+++ b/elaichi/pubspec.yaml
@@ -12,6 +12,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  
+  # Image caching
+  cached_network_image: ^2.5.0
 
   # Logging
   logger: ^0.9.2
@@ -28,8 +31,6 @@ dependencies:
   injectable: ^1.0.5
   dartz: ^0.9.1
 
-  shimmer: ^1.1.2
-
   # Themeing
   stacked_themes: ^0.2.2+1
   google_fonts: ^1.1.1
@@ -43,7 +44,7 @@ dependencies:
 
   # GraphQL client library
   graphql: ^4.0.0-beta.6
-  
+
   # Authentications
   firebase_core: ^0.5.3
   firebase_auth: ^0.18.4+1
@@ -55,6 +56,7 @@ dev_dependencies:
   lint: ^1.2.0
   mockito: ^4.1.1
   very_good_analysis: ^1.0.0
+  test_coverage: ^0.5.0
 
   build_runner: ^1.10.3
   auto_route_generator: ^0.6.6
@@ -63,10 +65,13 @@ dev_dependencies:
   # Local database
   hive_generator: ^0.7.1
 
-
 flutter:
   uses-material-design: true
   assets:
     - assets/translations/
     - assets/images/
     - assets/fonts/
+  fonts:
+    - family: Avenue
+      fonts:
+        - asset: assets/icons/avenue_icons.ttf  
diff --git a/elaichi/test/misc/failure_test.dart b/elaichi/test/misc/failure_test.dart
new file mode 100644
index 00000000..f67d0a39
--- /dev/null
+++ b/elaichi/test/misc/failure_test.dart
@@ -0,0 +1,12 @@
+import 'package:elaichi/app/failure.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  test(
+    'Failure - toString test',
+    () {
+      final failure = Failure(1, 'Test message');
+      expect(failure.toString(), equals('Test message'));
+    },
+  );
+}
diff --git a/elaichi/test/misc/margins_test.dart b/elaichi/test/misc/margins_test.dart
new file mode 100644
index 00000000..c025b4d0
--- /dev/null
+++ b/elaichi/test/misc/margins_test.dart
@@ -0,0 +1,26 @@
+import 'package:elaichi/app/config/display.dart';
+import 'package:elaichi/app/config/margins.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group(
+    'Margins - ',
+    () {
+      test(
+        'Margins are 8 for small displays',
+        () {
+          final margins = Margins(Display(size: DisplaySize.small));
+          final marginValue = margins.small;
+          expect(marginValue, 8.0);
+        },
+      );
+      test(
+        'Margins are 8 for xsmall displays',
+        () {
+          final margins = Margins(Display(size: DisplaySize.xsmall));
+          expect(margins.small, 8.0);
+        },
+      );
+    },
+  );
+}
diff --git a/elaichi/test/service_tests/api_test.dart b/elaichi/test/service_tests/api_test.dart
index dda2a4a8..ab73b3a2 100644
--- a/elaichi/test/service_tests/api_test.dart
+++ b/elaichi/test/service_tests/api_test.dart
@@ -1,112 +1 @@
-import 'dart:convert';
-import 'dart:io';
-import 'package:elaichi/services/fake_api.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/mockito.dart';
-
-import '../setup/test_helpers.dart';
-
-void main() {
-  group('Api -', () {
-    setUp(() async {
-      await registerServices();
-    });
-    tearDown(unregisterServices);
-
-    // test('Calling factory constructor of Api class should not return null',
-    // () {
-    //   final api = Api();
-    //   expect(api, isNotNull);
-    // });
-
-    test('Constructing Service should find correct dependencies', () {
-      final fakeApiService = MockApi();
-      expect(fakeApiService != null, true);
-    });
-
-    test('Given userId "test", should return user with name and email',
-        () async {
-      final fakeApiService = MockApi();
-
-      when(fakeApiService.getUser('test')).thenAnswer(
-        (_) => Future.value(
-          '''
-            {
-              "userId": "test",
-              "email": "john.doe@example.com",
-              "name": "John Doe"
-            }
-          ''',
-        ),
-      );
-
-      await fakeApiService.getUser('test');
-      verify(fakeApiService.getUser('test'));
-    });
-
-    test('Given a userId that does not exist, should return correct error', () {
-      final fakeApiService = MockApi();
-      when(fakeApiService.getUser('userId')).thenAnswer(
-        (_) => Future.value('error'),
-      );
-    });
-
-    test('Given errorMode 1, should throw SocketException', () async {
-      final fakeApiService = MockApi();
-      try {
-        await fakeApiService.getUser('test', errorMode: 1);
-      } catch (e) {
-        expect(e, isInstanceOf<SocketException>());
-      }
-    });
-
-    test('Given errorMode 2, should throw HttpExcpetion', () async {
-      final fakeApiService = MockApi();
-      try {
-        await fakeApiService.getUser('test', errorMode: 2);
-      } catch (e) {
-        expect(e, isInstanceOf<HttpException>());
-      }
-    });
-
-    test('Given errorMode 3, should return wrong json', () async {
-      final fakeApiService = FakeApi();
-      final result = await fakeApiService.getUser('test', errorMode: 3);
-      expect(result, isNotNull);
-      try {
-        json.decode(result);
-      } catch (e) {
-        expect(e, isInstanceOf<FormatException>());
-      }
-    });
-  });
-
-  test('Given errorMode 1, should throw SocketException', () async {
-    final fakeApiService = MockApi();
-    try {
-      await fakeApiService.getUser('test', errorMode: 1);
-    } catch (e) {
-      expect(e, isInstanceOf<SocketException>());
-    }
-  });
-
-  test('Given errorMode 2, should throw HttpExcpetion', () async {
-    final fakeApiService = MockApi();
-    try {
-      await fakeApiService.getUser('test', errorMode: 2);
-    } catch (e) {
-      expect(e, isInstanceOf<HttpException>());
-    }
-  });
-
-  test('Given errorMode 3, should return wrong json', () async {
-    final fakeApiService = FakeApi();
-    final result = await fakeApiService.getUser('test', errorMode: 3);
-    expect(result, isNotNull);
-    try {
-      json.decode(result);
-    } catch (e) {
-      expect(e, isInstanceOf<FormatException>());
-    }
-  });
-}
+void main() {}
diff --git a/elaichi/test/setup/test_helpers.dart b/elaichi/test/setup/test_helpers.dart
index 5c78f7bd..f2af1a00 100644
--- a/elaichi/test/setup/test_helpers.dart
+++ b/elaichi/test/setup/test_helpers.dart
@@ -9,7 +9,6 @@ import 'package:elaichi/services/auth.dart';
 import 'package:elaichi/services/graphql.dart';
 import 'package:elaichi/services/local_db.dart';
 import 'package:elaichi/services/api.dart';
-import 'package:elaichi/services/feed_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:mockito/mockito.dart';
@@ -33,8 +32,6 @@ class LocalDbMock extends Mock implements LocalDb {}
 
 class MockApi extends Mock implements Api {}
 
-class FeedServiceMock extends Mock implements FeedService {}
-
 class GraphQLMock extends Mock implements GraphQL {}
 
 class AuthMock extends Mock implements Auth {}
@@ -60,13 +57,6 @@ Api getAndRegisterApiMock() {
   return service;
 }
 
-FeedService getAndRegisterFeedServiceMock() {
-  _removeRegistrationIfExists<FeedService>();
-  final service = FeedServiceMock();
-  locator.registerSingleton<FeedService>(service);
-  return service;
-}
-
 NavigationService getAndRegisterNavigationServiceMock() {
   _removeRegistrationIfExists<NavigationService>();
   final service = NavigationServiceMock();
@@ -122,7 +112,6 @@ Future<void> registerServices() async {
   getAndRegisterThemeServiceMock();
   getAndRegisterLocalDbMock();
   getAndRegisterApiMock();
-  getAndRegisterFeedServiceMock();
   getAndRegisterGraphQLMock();
   getAndRegisterAuthMock();
 }
@@ -140,7 +129,6 @@ void unregisterServices() {
   if (locator.isRegistered<ThemeService>()) locator.unregister<ThemeService>();
   if (locator.isRegistered<LocalDb>()) locator.unregister<LocalDb>();
   if (locator.isRegistered<Api>()) locator.unregister<Api>();
-  if (locator.isRegistered<FeedService>()) locator.unregister<FeedService>();
   if (locator.isRegistered<GraphQL>()) locator.unregister<GraphQL>();
   if (locator.isRegistered<Auth>()) locator.unregister<Auth>();
 }
diff --git a/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart b/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart
index 00a6c135..b8784446 100644
--- a/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart
+++ b/elaichi/test/viewmodel_tests/feed_viewmodel_test.dart
@@ -17,6 +17,41 @@ void main() {
   });
   tearDown(unregisterServices);
   group('FeedViewmodel Test - ', () {
+    test(
+      'Intialise -',
+      () async {
+        final model = FeedViewModel();
+        final mockApi = locator<Api>();
+        final stories = List<CurrentStory>.generate(
+          10,
+          (index) => CurrentStory(
+            asset: '',
+            id: '',
+            description: '',
+            event: null,
+            assetType: '',
+            createdAt: null,
+            club: null,
+          ),
+        );
+        when(mockApi.getCurrentStories()).thenAnswer((_) async => stories);
+        final events = List<ScheduleEvent>.generate(
+          6,
+          (index) => ScheduleEvent(
+            time: '4.30 PM',
+            identifier: 'MA-3002',
+            title: 'Computational Mathematics',
+            contact: 'Prof. Nihar Patra',
+          ),
+        );
+        when(mockApi.fetchSchedule()).thenAnswer(
+          (_) async => events,
+        );
+        await model.initialise();
+        expect(model.isBusy, false);
+        expect(model.currentStories, Right(stories));
+      },
+    );
     group('API calls - ', () {
       group('Stories', () {
         test(
diff --git a/elaichi/test/viewmodel_tests/home_viewmodel_test.dart b/elaichi/test/viewmodel_tests/home_viewmodel_test.dart
index 47481039..cf436942 100644
--- a/elaichi/test/viewmodel_tests/home_viewmodel_test.dart
+++ b/elaichi/test/viewmodel_tests/home_viewmodel_test.dart
@@ -15,17 +15,5 @@ void main() {
         expect(model.title != null, true);
       });
     });
-    group('counter -', () {
-      test('When constructed, counter should return 0', () {
-        final model = HomeViewModel();
-        expect(model.counter, 0);
-      });
-
-      test('When called, counter should increase', () {
-        final model = HomeViewModel()..updateCounter();
-        // model.updateCounter();
-        expect(model.counter, 1);
-      });
-    });
   });
 }
diff --git a/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart b/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart
index 3708d763..a4a7b730 100644
--- a/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart
+++ b/elaichi/test/viewmodel_tests/startup_viewmodel_test.dart
@@ -32,6 +32,7 @@ void main() {
         final themeService = getAndRegisterThemeServiceMock();
         final model = StartupViewModel()
           ..changeTheme();
+        expect(model.isBusy, false);
         verify(themeService.toggleDarkLightTheme());
       });
     });
diff --git a/elaichi/test/widget_tests/feed_view_test.dart b/elaichi/test/widget_tests/feed_view_test.dart
new file mode 100644
index 00000000..efc8c794
--- /dev/null
+++ b/elaichi/test/widget_tests/feed_view_test.dart
@@ -0,0 +1,85 @@
+import 'package:elaichi/app/locator.dart';
+import 'package:elaichi/datamodels/api_models.dart';
+import 'package:elaichi/services/api.dart';
+import 'package:elaichi/ui/views/feed/feed_view.dart';
+import 'package:elaichi/ui/views/feed/feed_viewmodel.dart';
+import 'package:elaichi/ui/widgets/appbar.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
+
+import '../setup/test_helpers.dart';
+
+class FeedViewModelMock extends Mock implements FeedViewModel {}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  setUp(registerServices);
+  group('FeedView - ', () {
+    testWidgets('Constructing FeedView renders feed view correctly',
+        (WidgetTester tester) async {
+      final model = FeedViewModelMock();
+      final mockApi = locator<Api>();
+      final stories = List<CurrentStory>.generate(
+        10,
+        (index) => CurrentStory(
+          asset: '',
+          id: '',
+          description: '',
+          event: Event(
+              announcements: '',
+              organizer: Club(
+                logo: '',
+                society: '',
+                clubName: '',
+                id: '',
+                domain: '',
+                facAd: '',
+              ),
+              endDateTime: '',
+              registrationPrice: 20,
+              registrationCount: 20,
+              link: '',
+              otherDescription: '',
+              picture: '',
+              id: '',
+              attendees: [],
+              startDateTime: '',
+              eventName: ''),
+          assetType: '',
+          createdAt: DateTime(2021),
+          club: Club(
+            logo: '',
+            society: '',
+            clubName: '',
+            id: '',
+            domain: '',
+            facAd: '',
+          ),
+        ),
+      );
+      final events = List<ScheduleEvent>.generate(
+          4,
+          (index) => ScheduleEvent(
+              time: 'testTime',
+              contact: 'testContact',
+              title: 'testTitle',
+              identifier: 'test'));
+      when(mockApi.fetchSchedule()).thenAnswer((_) async => events);
+      when(mockApi.getCurrentStories()).thenAnswer((_) async => stories);
+      await tester.runAsync(
+        () async {
+          await tester.pumpWidget(
+            wrappedWidget(
+              const FeedView(),
+            ),
+          );
+          await tester.pumpAndSettle();
+          await tester.idle();
+          model.setInitialised(true);
+          await tester.pump();
+          expect(find.byType(ElaichiAppbar), findsOneWidget);
+        },
+      );
+    });
+  });
+}
diff --git a/elaichi/test/widget_tests/startup_view_test.dart b/elaichi/test/widget_tests/startup_view_test.dart
index 5c439fd4..d8ded40d 100644
--- a/elaichi/test/widget_tests/startup_view_test.dart
+++ b/elaichi/test/widget_tests/startup_view_test.dart
@@ -1,7 +1,9 @@
+import 'package:elaichi/app/router.gr.dart';
 import 'package:elaichi/ui/views/startup/startup_view.dart';
 import 'package:elaichi/ui/views/startup/startup_viewmodel.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
 
 import '../setup/test_helpers.dart';
 
@@ -24,30 +26,16 @@ void main() {
     expect(buttonFinder, findsOneWidget);
   });
 
-  // TODO: Implement navigation test - use NavigatorObservers
-
-  // testWidgets("when forward button is tapped, should navigate to home view",
-  //     (WidgetTester tester) async {
-  //   await tester.pumpWidget(Directionality(
-  //       textDirection: TextDirection.ltr,
-  //       child: MediaQuery(
-  //         data: const MediaQueryData(),
-  //         child: StartupView(),
-  //       )));
-
-  //   final startupViewModel = StartupViewModel();
-  //   final homeViewModel = HomeViewModel();
-
-  //   final buttonFinder = find.byIcon(Icons.arrow_forward);
-
-  //   final navigationService = getAndRegisterNavigationServiceMock();
-
-  //   expect(find.text(startupViewModel.title), findsOneWidget);
-  //   expect(find.text(homeViewModel.title), findsNothing);
-  //   await tester.tap(buttonFinder);
-  //   await tester.pumpAndSettle();
-
-  //   expect(find.text(startupViewModel.title), findsNothing);
-  //   expect(find.text(homeViewModel.title), findsOneWidget);
-  // });
+  testWidgets(
+    'When forward button is tapped, should navigate to home view',
+    (WidgetTester tester) async {
+      final navigationService = getAndRegisterNavigationServiceMock();
+      await tester.pumpWidget(wrappedWidget(StartupView()));
+      await tester.pumpAndSettle();
+      await tester.tap(find.byIcon(Icons.arrow_forward));
+      verify(navigationService.navigateTo(Routes.homeView));
+      // await tester.pumpAndSettle();
+      // expect(find.byType(ElaichiAppbar), findsOneWidget);
+    },
+  );
 }
diff --git a/elaichi/test/widget_tests/widgets/appbar_test.dart b/elaichi/test/widget_tests/widgets/appbar_test.dart
new file mode 100644
index 00000000..abe76850
--- /dev/null
+++ b/elaichi/test/widget_tests/widgets/appbar_test.dart
@@ -0,0 +1,19 @@
+import 'package:elaichi/ui/widgets/appbar.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../setup/test_helpers.dart';
+
+void main() {
+  testWidgets(
+    'Appbar is rendered with correct title',
+    (WidgetTester tester) async {
+      const title = 'Test Title';
+      await tester.pumpWidget(wrappedWidget(const ElaichiAppbar(
+        title: title,
+        centerTitle: true,
+        appbarHeight: 80,
+      )));
+      expect(find.text(title), findsOneWidget);
+    },
+  );
+}