diff --git a/PrivacyDashboardiOS/Classes/Extension/ExtensionMethods.swift b/PrivacyDashboardiOS/Classes/Extension/ExtensionMethods.swift
index 308d7b7..e2f2100 100644
--- a/PrivacyDashboardiOS/Classes/Extension/ExtensionMethods.swift
+++ b/PrivacyDashboardiOS/Classes/Extension/ExtensionMethods.swift
@@ -526,14 +526,4 @@ extension Data {
     func to<T>(type: T.Type) -> T {
         return self.withUnsafeBytes { $0.load(as: T.self) }
     }
-    
-//    func addLoadingIndicator(){
-//        DispatchQueue.main.async(execute: { () -> Void in
-//            MBProgressHUD.showAdded(to: self.view, animated: true)
-//        })
-//    }
-//
-//    func removeLoadingIndicator(){
-//        MBProgressHUD.hide(for: self.view, animated: true)
-//    }
 }
diff --git a/PrivacyDashboardiOS/Classes/Libraries/MBProgressHUD.h b/PrivacyDashboardiOS/Classes/Libraries/MBProgressHUD.h
deleted file mode 100644
index 38b5004..0000000
--- a/PrivacyDashboardiOS/Classes/Libraries/MBProgressHUD.h
+++ /dev/null
@@ -1,411 +0,0 @@
-//
-//  MBProgressHUD.h
-//  Version 1.2.0
-//  Created by Matej Bukovinski on 2.4.09.
-//
-
-// This code is distributed under the terms and conditions of the MIT license.
-
-// Copyright © 2009-2016 Matej Bukovinski
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <CoreGraphics/CoreGraphics.h>
-
-@class MBBackgroundView;
-@protocol MBProgressHUDDelegate;
-
-
-extern CGFloat const MBProgressMaxOffset;
-
-typedef NS_ENUM(NSInteger, MBProgressHUDMode) {
-    /// UIActivityIndicatorView.
-    MBProgressHUDModeIndeterminate,
-    /// A round, pie-chart like, progress view.
-    MBProgressHUDModeDeterminate,
-    /// Horizontal progress bar.
-    MBProgressHUDModeDeterminateHorizontalBar,
-    /// Ring-shaped progress view.
-    MBProgressHUDModeAnnularDeterminate,
-    /// Shows a custom view.
-    MBProgressHUDModeCustomView,
-    /// Shows only labels.
-    MBProgressHUDModeText
-};
-
-typedef NS_ENUM(NSInteger, MBProgressHUDAnimation) {
-    /// Opacity animation
-    MBProgressHUDAnimationFade,
-    /// Opacity + scale animation (zoom in when appearing zoom out when disappearing)
-    MBProgressHUDAnimationZoom,
-    /// Opacity + scale animation (zoom out style)
-    MBProgressHUDAnimationZoomOut,
-    /// Opacity + scale animation (zoom in style)
-    MBProgressHUDAnimationZoomIn
-};
-
-typedef NS_ENUM(NSInteger, MBProgressHUDBackgroundStyle) {
-    /// Solid color background
-    MBProgressHUDBackgroundStyleSolidColor,
-    /// UIVisualEffectView or UIToolbar.layer background view
-    MBProgressHUDBackgroundStyleBlur
-};
-
-typedef void (^MBProgressHUDCompletionBlock)(void);
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-
-/**
- * Displays a simple HUD window containing a progress indicator and two optional labels for short messages.
- *
- * This is a simple drop-in class for displaying a progress HUD view similar to Apple's private UIProgressHUD class.
- * The MBProgressHUD window spans over the entire space given to it by the initWithFrame: constructor and catches all
- * user input on this region, thereby preventing the user operations on components below the view.
- *
- * @note To still allow touches to pass through the HUD, you can set hud.userInteractionEnabled = NO.
- * @attention MBProgressHUD is a UI class and should therefore only be accessed on the main thread.
- */
-@interface MBProgressHUD : UIView
-
-/**
- * Creates a new HUD, adds it to provided view and shows it. The counterpart to this method is hideHUDForView:animated:.
- *
- * @note This method sets removeFromSuperViewOnHide. The HUD will automatically be removed from the view hierarchy when hidden.
- *
- * @param view The view that the HUD will be added to
- * @param animated If set to YES the HUD will appear using the current animationType. If set to NO the HUD will not use
- * animations while appearing.
- * @return A reference to the created HUD.
- *
- * @see hideHUDForView:animated:
- * @see animationType
- */
-+ (instancetype)showHUDAddedTo:(UIView *)view animated:(BOOL)animated;
-
-/// @name Showing and hiding
-
-/**
- * Finds the top-most HUD subview that hasn't finished and hides it. The counterpart to this method is showHUDAddedTo:animated:.
- *
- * @note This method sets removeFromSuperViewOnHide. The HUD will automatically be removed from the view hierarchy when hidden.
- *
- * @param view The view that is going to be searched for a HUD subview.
- * @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
- * animations while disappearing.
- * @return YES if a HUD was found and removed, NO otherwise.
- *
- * @see showHUDAddedTo:animated:
- * @see animationType
- */
-+ (BOOL)hideHUDForView:(UIView *)view animated:(BOOL)animated;
-
-/**
- * Finds the top-most HUD subview that hasn't finished and returns it.
- *
- * @param view The view that is going to be searched.
- * @return A reference to the last HUD subview discovered.
- */
-+ (nullable MBProgressHUD *)HUDForView:(UIView *)view NS_SWIFT_NAME(forView(_:));
-
-/**
- * A convenience constructor that initializes the HUD with the view's bounds. Calls the designated constructor with
- * view.bounds as the parameter.
- *
- * @param view The view instance that will provide the bounds for the HUD. Should be the same instance as
- * the HUD's superview (i.e., the view that the HUD will be added to).
- */
-- (instancetype)initWithView:(UIView *)view;
-
-/**
- * Displays the HUD.
- *
- * @note You need to make sure that the main thread completes its run loop soon after this method call so that
- * the user interface can be updated. Call this method when your task is already set up to be executed in a new thread
- * (e.g., when using something like NSOperation or making an asynchronous call like NSURLRequest).
- *
- * @param animated If set to YES the HUD will appear using the current animationType. If set to NO the HUD will not use
- * animations while appearing.
- *
- * @see animationType
- */
-- (void)showAnimated:(BOOL)animated;
-
-/**
- * Hides the HUD. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to
- * hide the HUD when your task completes.
- *
- * @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
- * animations while disappearing.
- *
- * @see animationType
- */
-- (void)hideAnimated:(BOOL)animated;
-
-/**
- * Hides the HUD after a delay. This still calls the hudWasHidden: delegate. This is the counterpart of the show: method. Use it to
- * hide the HUD when your task completes.
- *
- * @param animated If set to YES the HUD will disappear using the current animationType. If set to NO the HUD will not use
- * animations while disappearing.
- * @param delay Delay in seconds until the HUD is hidden.
- *
- * @see animationType
- */
-- (void)hideAnimated:(BOOL)animated afterDelay:(NSTimeInterval)delay;
-
-/**
- * The HUD delegate object. Receives HUD state notifications.
- */
-@property (weak, nonatomic) id<MBProgressHUDDelegate> delegate;
-
-/**
- * Called after the HUD is hidden.
- */
-@property (copy, nullable) MBProgressHUDCompletionBlock completionBlock;
-
-/**
- * Grace period is the time (in seconds) that the invoked method may be run without
- * showing the HUD. If the task finishes before the grace time runs out, the HUD will
- * not be shown at all.
- * This may be used to prevent HUD display for very short tasks.
- * Defaults to 0 (no grace time).
- * @note The graceTime needs to be set before the hud is shown. You thus can't use `showHUDAddedTo:animated:`,
- * but instead need to alloc / init the HUD, configure the grace time and than show it manually.
- */
-@property (assign, nonatomic) NSTimeInterval graceTime;
-
-/**
- * The minimum time (in seconds) that the HUD is shown.
- * This avoids the problem of the HUD being shown and than instantly hidden.
- * Defaults to 0 (no minimum show time).
- */
-@property (assign, nonatomic) NSTimeInterval minShowTime;
-
-/**
- * Removes the HUD from its parent view when hidden.
- * Defaults to NO.
- */
-@property (assign, nonatomic) BOOL removeFromSuperViewOnHide;
-
-/// @name Appearance
-
-/**
- * MBProgressHUD operation mode. The default is MBProgressHUDModeIndeterminate.
- */
-@property (assign, nonatomic) MBProgressHUDMode mode;
-
-/**
- * A color that gets forwarded to all labels and supported indicators. Also sets the tintColor
- * for custom views on iOS 7+. Set to nil to manage color individually.
- * Defaults to semi-translucent black on iOS 7 and later and white on earlier iOS versions.
- */
-@property (strong, nonatomic, nullable) UIColor *contentColor UI_APPEARANCE_SELECTOR;
-
-/**
- * The animation type that should be used when the HUD is shown and hidden.
- */
-@property (assign, nonatomic) MBProgressHUDAnimation animationType UI_APPEARANCE_SELECTOR;
-
-/**
- * The bezel offset relative to the center of the view. You can use MBProgressMaxOffset
- * and -MBProgressMaxOffset to move the HUD all the way to the screen edge in each direction.
- * E.g., CGPointMake(0.f, MBProgressMaxOffset) would position the HUD centered on the bottom edge.
- */
-@property (assign, nonatomic) CGPoint offset UI_APPEARANCE_SELECTOR;
-
-/**
- * The amount of space between the HUD edge and the HUD elements (labels, indicators or custom views).
- * This also represents the minimum bezel distance to the edge of the HUD view.
- * Defaults to 20.f
- */
-@property (assign, nonatomic) CGFloat margin UI_APPEARANCE_SELECTOR;
-
-/**
- * The minimum size of the HUD bezel. Defaults to CGSizeZero (no minimum size).
- */
-@property (assign, nonatomic) CGSize minSize UI_APPEARANCE_SELECTOR;
-
-/**
- * Force the HUD dimensions to be equal if possible.
- */
-@property (assign, nonatomic, getter = isSquare) BOOL square UI_APPEARANCE_SELECTOR;
-
-/**
- * When enabled, the bezel center gets slightly affected by the device accelerometer data.
- * Defaults to NO.
- *
- * @note This can cause main thread checker assertions on certain devices. https://github.com/jdg/MBProgressHUD/issues/552
- */
-@property (assign, nonatomic, getter=areDefaultMotionEffectsEnabled) BOOL defaultMotionEffectsEnabled UI_APPEARANCE_SELECTOR;
-
-/// @name Progress
-
-/**
- * The progress of the progress indicator, from 0.0 to 1.0. Defaults to 0.0.
- */
-@property (assign, nonatomic) float progress;
-
-/// @name ProgressObject
-
-/**
- * The NSProgress object feeding the progress information to the progress indicator.
- */
-@property (strong, nonatomic, nullable) NSProgress *progressObject;
-
-/// @name Views
-
-/**
- * The view containing the labels and indicator (or customView).
- */
-@property (strong, nonatomic, readonly) MBBackgroundView *bezelView;
-
-/**
- * View covering the entire HUD area, placed behind bezelView.
- */
-@property (strong, nonatomic, readonly) MBBackgroundView *backgroundView;
-
-/**
- * The UIView (e.g., a UIImageView) to be shown when the HUD is in MBProgressHUDModeCustomView.
- * The view should implement intrinsicContentSize for proper sizing. For best results use approximately 37 by 37 pixels.
- */
-@property (strong, nonatomic, nullable) UIView *customView;
-
-/**
- * A label that holds an optional short message to be displayed below the activity indicator. The HUD is automatically resized to fit
- * the entire text.
- */
-@property (strong, nonatomic, readonly) UILabel *label;
-
-/**
- * A label that holds an optional details message displayed below the labelText message. The details text can span multiple lines.
- */
-@property (strong, nonatomic, readonly) UILabel *detailsLabel;
-
-/**
- * A button that is placed below the labels. Visible only if a target / action is added and a title is assigned..
- */
-@property (strong, nonatomic, readonly) UIButton *button;
-
-@end
-
-
-@protocol MBProgressHUDDelegate <NSObject>
-
-@optional
-
-/**
- * Called after the HUD was fully hidden from the screen.
- */
-- (void)hudWasHidden:(MBProgressHUD *)hud;
-
-@end
-
-
-/**
- * A progress view for showing definite progress by filling up a circle (pie chart).
- */
-@interface MBRoundProgressView : UIView
-
-/**
- * Progress (0.0 to 1.0)
- */
-@property (nonatomic, assign) float progress;
-
-/**
- * Indicator progress color.
- * Defaults to white [UIColor whiteColor].
- */
-@property (nonatomic, strong) UIColor *progressTintColor;
-
-/**
- * Indicator background (non-progress) color.
- * Only applicable on iOS versions older than iOS 7.
- * Defaults to translucent white (alpha 0.1).
- */
-@property (nonatomic, strong) UIColor *backgroundTintColor;
-
-/*
- * Display mode - NO = round or YES = annular. Defaults to round.
- */
-@property (nonatomic, assign, getter = isAnnular) BOOL annular;
-
-@end
-
-
-/**
- * A flat bar progress view.
- */
-@interface MBBarProgressView : UIView
-
-/**
- * Progress (0.0 to 1.0)
- */
-@property (nonatomic, assign) float progress;
-
-/**
- * Bar border line color.
- * Defaults to white [UIColor whiteColor].
- */
-@property (nonatomic, strong) UIColor *lineColor;
-
-/**
- * Bar background color.
- * Defaults to clear [UIColor clearColor];
- */
-@property (nonatomic, strong) UIColor *progressRemainingColor;
-
-/**
- * Bar progress color.
- * Defaults to white [UIColor whiteColor].
- */
-@property (nonatomic, strong) UIColor *progressColor;
-
-@end
-
-
-@interface MBBackgroundView : UIView
-
-/**
- * The background style.
- * Defaults to MBProgressHUDBackgroundStyleBlur.
- */
-@property (nonatomic) MBProgressHUDBackgroundStyle style;
-
-/**
- * The blur effect style, when using MBProgressHUDBackgroundStyleBlur.
- * Defaults to UIBlurEffectStyleLight.
- */
-@property (nonatomic) UIBlurEffectStyle blurEffectStyle;
-
-/**
- * The background color or the blur tint color.
- *
- * Defaults to nil on iOS 13 and later and
- * `[UIColor colorWithWhite:0.8f alpha:0.6f]`
- * on older systems.
- */
-@property (nonatomic, strong, nullable) UIColor *color;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/PrivacyDashboardiOS/Classes/Libraries/MBProgressHUD.m b/PrivacyDashboardiOS/Classes/Libraries/MBProgressHUD.m
deleted file mode 100644
index a2829a3..0000000
--- a/PrivacyDashboardiOS/Classes/Libraries/MBProgressHUD.m
+++ /dev/null
@@ -1,1194 +0,0 @@
-//
-// MBProgressHUD.m
-// Version 1.2.0
-// Created by Matej Bukovinski on 2.4.09.
-//
-
-#import "MBProgressHUD.h"
-#import <tgmath.h>
-
-#define MBMainThreadAssert() NSAssert([NSThread isMainThread], @"MBProgressHUD needs to be accessed on the main thread.");
-
-CGFloat const MBProgressMaxOffset = 1000000.f;
-
-static const CGFloat MBDefaultPadding = 4.f;
-static const CGFloat MBDefaultLabelFontSize = 16.f;
-static const CGFloat MBDefaultDetailsLabelFontSize = 12.f;
-
-
-@interface MBProgressHUD ()
-
-@property (nonatomic, assign) BOOL useAnimation;
-@property (nonatomic, assign, getter=hasFinished) BOOL finished;
-@property (nonatomic, strong) UIView *indicator;
-@property (nonatomic, strong) NSDate *showStarted;
-@property (nonatomic, strong) NSArray *paddingConstraints;
-@property (nonatomic, strong) NSArray *bezelConstraints;
-@property (nonatomic, strong) UIView *topSpacer;
-@property (nonatomic, strong) UIView *bottomSpacer;
-@property (nonatomic, strong) UIMotionEffectGroup *bezelMotionEffects;
-@property (nonatomic, weak) NSTimer *graceTimer;
-@property (nonatomic, weak) NSTimer *minShowTimer;
-@property (nonatomic, weak) NSTimer *hideDelayTimer;
-@property (nonatomic, weak) CADisplayLink *progressObjectDisplayLink;
-
-@end
-
-
-@interface MBProgressHUDRoundedButton : UIButton
-@end
-
-
-@implementation MBProgressHUD
-
-#pragma mark - Class methods
-
-+ (instancetype)showHUDAddedTo:(UIView *)view animated:(BOOL)animated {
-    MBProgressHUD *hud = [[self alloc] initWithView:view];
-    hud.removeFromSuperViewOnHide = YES;
-    [view addSubview:hud];
-    [hud showAnimated:animated];
-    return hud;
-}
-
-+ (BOOL)hideHUDForView:(UIView *)view animated:(BOOL)animated {
-    MBProgressHUD *hud = [self HUDForView:view];
-    if (hud != nil) {
-        hud.removeFromSuperViewOnHide = YES;
-        [hud hideAnimated:animated];
-        return YES;
-    }
-    return NO;
-}
-
-+ (MBProgressHUD *)HUDForView:(UIView *)view {
-    NSEnumerator *subviewsEnum = [view.subviews reverseObjectEnumerator];
-    for (UIView *subview in subviewsEnum) {
-        if ([subview isKindOfClass:self]) {
-            MBProgressHUD *hud = (MBProgressHUD *)subview;
-            if (hud.hasFinished == NO) {
-                return hud;
-            }
-        }
-    }
-    return nil;
-}
-
-#pragma mark - Lifecycle
-
-- (void)commonInit {
-    // Set default values for properties
-    _animationType = MBProgressHUDAnimationFade;
-    _mode = MBProgressHUDModeIndeterminate;
-    _margin = 20.0f;
-    _defaultMotionEffectsEnabled = NO;
-
-    if (@available(iOS 13.0, tvOS 13, *)) {
-       _contentColor = [[UIColor labelColor] colorWithAlphaComponent:0.7f];
-    } else {
-        _contentColor = [UIColor colorWithWhite:0.f alpha:0.7f];
-    }
-
-    // Transparent background
-    self.opaque = NO;
-    self.backgroundColor = [UIColor clearColor];
-    // Make it invisible for now
-    self.alpha = 0.0f;
-    self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    self.layer.allowsGroupOpacity = NO;
-
-    [self setupViews];
-    [self updateIndicators];
-    [self registerForNotifications];
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
-        [self commonInit];
-    }
-    return self;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
-    if ((self = [super initWithCoder:aDecoder])) {
-        [self commonInit];
-    }
-    return self;
-}
-
-- (id)initWithView:(UIView *)view {
-    NSAssert(view, @"View must not be nil.");
-    return [self initWithFrame:view.bounds];
-}
-
-- (void)dealloc {
-    [self unregisterFromNotifications];
-}
-
-#pragma mark - Show & hide
-
-- (void)showAnimated:(BOOL)animated {
-    MBMainThreadAssert();
-    [self.minShowTimer invalidate];
-    self.useAnimation = animated;
-    self.finished = NO;
-    // If the grace time is set, postpone the HUD display
-    if (self.graceTime > 0.0) {
-        NSTimer *timer = [NSTimer timerWithTimeInterval:self.graceTime target:self selector:@selector(handleGraceTimer:) userInfo:nil repeats:NO];
-        [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
-        self.graceTimer = timer;
-    }
-    // ... otherwise show the HUD immediately
-    else {
-        [self showUsingAnimation:self.useAnimation];
-    }
-}
-
-- (void)hideAnimated:(BOOL)animated {
-    MBMainThreadAssert();
-    [self.graceTimer invalidate];
-    self.useAnimation = animated;
-    self.finished = YES;
-    // If the minShow time is set, calculate how long the HUD was shown,
-    // and postpone the hiding operation if necessary
-    if (self.minShowTime > 0.0 && self.showStarted) {
-        NSTimeInterval interv = [[NSDate date] timeIntervalSinceDate:self.showStarted];
-        if (interv < self.minShowTime) {
-            NSTimer *timer = [NSTimer timerWithTimeInterval:(self.minShowTime - interv) target:self selector:@selector(handleMinShowTimer:) userInfo:nil repeats:NO];
-            [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
-            self.minShowTimer = timer;
-            return;
-        }
-    }
-    // ... otherwise hide the HUD immediately
-    [self hideUsingAnimation:self.useAnimation];
-}
-
-- (void)hideAnimated:(BOOL)animated afterDelay:(NSTimeInterval)delay {
-    // Cancel any scheduled hideAnimated:afterDelay: calls
-    [self.hideDelayTimer invalidate];
-
-    NSTimer *timer = [NSTimer timerWithTimeInterval:delay target:self selector:@selector(handleHideTimer:) userInfo:@(animated) repeats:NO];
-    [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
-    self.hideDelayTimer = timer;
-}
-
-#pragma mark - Timer callbacks
-
-- (void)handleGraceTimer:(NSTimer *)theTimer {
-    // Show the HUD only if the task is still running
-    if (!self.hasFinished) {
-        [self showUsingAnimation:self.useAnimation];
-    }
-}
-
-- (void)handleMinShowTimer:(NSTimer *)theTimer {
-    [self hideUsingAnimation:self.useAnimation];
-}
-
-- (void)handleHideTimer:(NSTimer *)timer {
-    [self hideAnimated:[timer.userInfo boolValue]];
-}
-
-#pragma mark - View Hierrarchy
-
-- (void)didMoveToSuperview {
-    [self updateForCurrentOrientationAnimated:NO];
-}
-
-#pragma mark - Internal show & hide operations
-
-- (void)showUsingAnimation:(BOOL)animated {
-    // Cancel any previous animations
-    [self.bezelView.layer removeAllAnimations];
-    [self.backgroundView.layer removeAllAnimations];
-
-    // Cancel any scheduled hideAnimated:afterDelay: calls
-    [self.hideDelayTimer invalidate];
-
-    self.showStarted = [NSDate date];
-    self.alpha = 1.f;
-
-    // Needed in case we hide and re-show with the same NSProgress object attached.
-    [self setNSProgressDisplayLinkEnabled:YES];
-
-    // Set up motion effects only at this point to avoid needlessly
-    // creating the effect if it was disabled after initialization.
-    [self updateBezelMotionEffects];
-
-    if (animated) {
-        [self animateIn:YES withType:self.animationType completion:NULL];
-    } else {
-        self.bezelView.alpha = 1.f;
-        self.backgroundView.alpha = 1.f;
-    }
-}
-
-- (void)hideUsingAnimation:(BOOL)animated {
-    // Cancel any scheduled hideAnimated:afterDelay: calls.
-    // This needs to happen here instead of in done,
-    // to avoid races if another hideAnimated:afterDelay:
-    // call comes in while the HUD is animating out.
-    [self.hideDelayTimer invalidate];
-
-    if (animated && self.showStarted) {
-        self.showStarted = nil;
-        [self animateIn:NO withType:self.animationType completion:^(BOOL finished) {
-            [self done];
-        }];
-    } else {
-        self.showStarted = nil;
-        self.bezelView.alpha = 0.f;
-        self.backgroundView.alpha = 1.f;
-        [self done];
-    }
-}
-
-- (void)animateIn:(BOOL)animatingIn withType:(MBProgressHUDAnimation)type completion:(void(^)(BOOL finished))completion {
-    // Automatically determine the correct zoom animation type
-    if (type == MBProgressHUDAnimationZoom) {
-        type = animatingIn ? MBProgressHUDAnimationZoomIn : MBProgressHUDAnimationZoomOut;
-    }
-
-    CGAffineTransform small = CGAffineTransformMakeScale(0.5f, 0.5f);
-    CGAffineTransform large = CGAffineTransformMakeScale(1.5f, 1.5f);
-
-    // Set starting state
-    UIView *bezelView = self.bezelView;
-    if (animatingIn && bezelView.alpha == 0.f && type == MBProgressHUDAnimationZoomIn) {
-        bezelView.transform = small;
-    } else if (animatingIn && bezelView.alpha == 0.f && type == MBProgressHUDAnimationZoomOut) {
-        bezelView.transform = large;
-    }
-
-    // Perform animations
-    dispatch_block_t animations = ^{
-        if (animatingIn) {
-            bezelView.transform = CGAffineTransformIdentity;
-        } else if (!animatingIn && type == MBProgressHUDAnimationZoomIn) {
-            bezelView.transform = large;
-        } else if (!animatingIn && type == MBProgressHUDAnimationZoomOut) {
-            bezelView.transform = small;
-        }
-        CGFloat alpha = animatingIn ? 1.f : 0.f;
-        bezelView.alpha = alpha;
-        self.backgroundView.alpha = alpha;
-    };
-    [UIView animateWithDuration:0.3 delay:0. usingSpringWithDamping:1.f initialSpringVelocity:0.f options:UIViewAnimationOptionBeginFromCurrentState animations:animations completion:completion];
-}
-
-- (void)done {
-    [self setNSProgressDisplayLinkEnabled:NO];
-
-    if (self.hasFinished) {
-        self.alpha = 0.0f;
-        if (self.removeFromSuperViewOnHide) {
-            [self removeFromSuperview];
-        }
-    }
-    MBProgressHUDCompletionBlock completionBlock = self.completionBlock;
-    if (completionBlock) {
-        completionBlock();
-    }
-    id<MBProgressHUDDelegate> delegate = self.delegate;
-    if ([delegate respondsToSelector:@selector(hudWasHidden:)]) {
-        [delegate performSelector:@selector(hudWasHidden:) withObject:self];
-    }
-}
-
-#pragma mark - UI
-
-- (void)setupViews {
-    UIColor *defaultColor = self.contentColor;
-
-    MBBackgroundView *backgroundView = [[MBBackgroundView alloc] initWithFrame:self.bounds];
-    backgroundView.style = MBProgressHUDBackgroundStyleSolidColor;
-    backgroundView.backgroundColor = [UIColor clearColor];
-    backgroundView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    backgroundView.alpha = 0.f;
-    [self addSubview:backgroundView];
-    _backgroundView = backgroundView;
-
-    MBBackgroundView *bezelView = [MBBackgroundView new];
-    bezelView.translatesAutoresizingMaskIntoConstraints = NO;
-    bezelView.layer.cornerRadius = 5.f;
-    bezelView.alpha = 0.f;
-    [self addSubview:bezelView];
-    _bezelView = bezelView;
-
-    UILabel *label = [UILabel new];
-    label.adjustsFontSizeToFitWidth = NO;
-    label.textAlignment = NSTextAlignmentCenter;
-    label.textColor = defaultColor;
-    label.font = [UIFont boldSystemFontOfSize:MBDefaultLabelFontSize];
-    label.opaque = NO;
-    label.backgroundColor = [UIColor clearColor];
-    _label = label;
-
-    UILabel *detailsLabel = [UILabel new];
-    detailsLabel.adjustsFontSizeToFitWidth = NO;
-    detailsLabel.textAlignment = NSTextAlignmentCenter;
-    detailsLabel.textColor = defaultColor;
-    detailsLabel.numberOfLines = 0;
-    detailsLabel.font = [UIFont boldSystemFontOfSize:MBDefaultDetailsLabelFontSize];
-    detailsLabel.opaque = NO;
-    detailsLabel.backgroundColor = [UIColor clearColor];
-    _detailsLabel = detailsLabel;
-
-    UIButton *button = [MBProgressHUDRoundedButton buttonWithType:UIButtonTypeCustom];
-    button.titleLabel.textAlignment = NSTextAlignmentCenter;
-    button.titleLabel.font = [UIFont boldSystemFontOfSize:MBDefaultDetailsLabelFontSize];
-    [button setTitleColor:defaultColor forState:UIControlStateNormal];
-    _button = button;
-
-    for (UIView *view in @[label, detailsLabel, button]) {
-        view.translatesAutoresizingMaskIntoConstraints = NO;
-        [view setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisHorizontal];
-        [view setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisVertical];
-        [bezelView addSubview:view];
-    }
-
-    UIView *topSpacer = [UIView new];
-    topSpacer.translatesAutoresizingMaskIntoConstraints = NO;
-    topSpacer.hidden = YES;
-    [bezelView addSubview:topSpacer];
-    _topSpacer = topSpacer;
-
-    UIView *bottomSpacer = [UIView new];
-    bottomSpacer.translatesAutoresizingMaskIntoConstraints = NO;
-    bottomSpacer.hidden = YES;
-    [bezelView addSubview:bottomSpacer];
-    _bottomSpacer = bottomSpacer;
-}
-
-- (void)updateIndicators {
-    UIView *indicator = self.indicator;
-    BOOL isActivityIndicator = [indicator isKindOfClass:[UIActivityIndicatorView class]];
-    BOOL isRoundIndicator = [indicator isKindOfClass:[MBRoundProgressView class]];
-
-    MBProgressHUDMode mode = self.mode;
-    if (mode == MBProgressHUDModeIndeterminate) {
-        if (!isActivityIndicator) {
-            // Update to indeterminate indicator
-            UIActivityIndicatorView *activityIndicator;
-            [indicator removeFromSuperview];
-#if !TARGET_OS_MACCATALYST
-            if (@available(iOS 13.0, tvOS 13.0, *)) {
-#endif
-                activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge];
-                activityIndicator.color = [UIColor whiteColor];
-#if !TARGET_OS_MACCATALYST
-            } else {
-               activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
-            }
-#endif
-            [activityIndicator startAnimating];
-            indicator = activityIndicator;
-            [self.bezelView addSubview:indicator];
-        }
-    }
-    else if (mode == MBProgressHUDModeDeterminateHorizontalBar) {
-        // Update to bar determinate indicator
-        [indicator removeFromSuperview];
-        indicator = [[MBBarProgressView alloc] init];
-        [self.bezelView addSubview:indicator];
-    }
-    else if (mode == MBProgressHUDModeDeterminate || mode == MBProgressHUDModeAnnularDeterminate) {
-        if (!isRoundIndicator) {
-            // Update to determinante indicator
-            [indicator removeFromSuperview];
-            indicator = [[MBRoundProgressView alloc] init];
-            [self.bezelView addSubview:indicator];
-        }
-        if (mode == MBProgressHUDModeAnnularDeterminate) {
-            [(MBRoundProgressView *)indicator setAnnular:YES];
-        }
-    }
-    else if (mode == MBProgressHUDModeCustomView && self.customView != indicator) {
-        // Update custom view indicator
-        [indicator removeFromSuperview];
-        indicator = self.customView;
-        [self.bezelView addSubview:indicator];
-    }
-    else if (mode == MBProgressHUDModeText) {
-        [indicator removeFromSuperview];
-        indicator = nil;
-    }
-    indicator.translatesAutoresizingMaskIntoConstraints = NO;
-    self.indicator = indicator;
-
-    if ([indicator respondsToSelector:@selector(setProgress:)]) {
-        [(id)indicator setValue:@(self.progress) forKey:@"progress"];
-    }
-
-    [indicator setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisHorizontal];
-    [indicator setContentCompressionResistancePriority:998.f forAxis:UILayoutConstraintAxisVertical];
-
-    [self updateViewsForColor:self.contentColor];
-    [self setNeedsUpdateConstraints];
-}
-
-- (void)updateViewsForColor:(UIColor *)color {
-    if (!color) return;
-
-    self.label.textColor = color;
-    self.detailsLabel.textColor = color;
-    [self.button setTitleColor:color forState:UIControlStateNormal];
-
-    // UIAppearance settings are prioritized. If they are preset the set color is ignored.
-
-    UIView *indicator = self.indicator;
-    if ([indicator isKindOfClass:[UIActivityIndicatorView class]]) {
-        UIActivityIndicatorView *appearance = nil;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-        appearance = [UIActivityIndicatorView appearanceWhenContainedIn:[MBProgressHUD class], nil];
-#else
-        // For iOS 9+
-        appearance = [UIActivityIndicatorView appearanceWhenContainedInInstancesOfClasses:@[[MBProgressHUD class]]];
-#endif
-
-        if (appearance.color == nil) {
-            ((UIActivityIndicatorView *)indicator).color = color;
-        }
-    } else if ([indicator isKindOfClass:[MBRoundProgressView class]]) {
-        MBRoundProgressView *appearance = nil;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-        appearance = [MBRoundProgressView appearanceWhenContainedIn:[MBProgressHUD class], nil];
-#else
-        appearance = [MBRoundProgressView appearanceWhenContainedInInstancesOfClasses:@[[MBProgressHUD class]]];
-#endif
-        if (appearance.progressTintColor == nil) {
-            ((MBRoundProgressView *)indicator).progressTintColor = color;
-        }
-        if (appearance.backgroundTintColor == nil) {
-            ((MBRoundProgressView *)indicator).backgroundTintColor = [color colorWithAlphaComponent:0.1];
-        }
-    } else if ([indicator isKindOfClass:[MBBarProgressView class]]) {
-        MBBarProgressView *appearance = nil;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-        appearance = [MBBarProgressView appearanceWhenContainedIn:[MBProgressHUD class], nil];
-#else
-        appearance = [MBBarProgressView appearanceWhenContainedInInstancesOfClasses:@[[MBProgressHUD class]]];
-#endif
-        if (appearance.progressColor == nil) {
-            ((MBBarProgressView *)indicator).progressColor = color;
-        }
-        if (appearance.lineColor == nil) {
-            ((MBBarProgressView *)indicator).lineColor = color;
-        }
-    } else {
-        [indicator setTintColor:color];
-    }
-}
-
-- (void)updateBezelMotionEffects {
-    MBBackgroundView *bezelView = self.bezelView;
-    UIMotionEffectGroup *bezelMotionEffects = self.bezelMotionEffects;
-
-    if (self.defaultMotionEffectsEnabled && !bezelMotionEffects) {
-        CGFloat effectOffset = 10.f;
-        UIInterpolatingMotionEffect *effectX = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"center.x" type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
-        effectX.maximumRelativeValue = @(effectOffset);
-        effectX.minimumRelativeValue = @(-effectOffset);
-
-        UIInterpolatingMotionEffect *effectY = [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"center.y" type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
-        effectY.maximumRelativeValue = @(effectOffset);
-        effectY.minimumRelativeValue = @(-effectOffset);
-
-        UIMotionEffectGroup *group = [[UIMotionEffectGroup alloc] init];
-        group.motionEffects = @[effectX, effectY];
-
-        self.bezelMotionEffects = group;
-        [bezelView addMotionEffect:group];
-    } else if (bezelMotionEffects) {
-        self.bezelMotionEffects = nil;
-        [bezelView removeMotionEffect:bezelMotionEffects];
-    }
-}
-
-#pragma mark - Layout
-
-- (void)updateConstraints {
-    UIView *bezel = self.bezelView;
-    UIView *topSpacer = self.topSpacer;
-    UIView *bottomSpacer = self.bottomSpacer;
-    CGFloat margin = self.margin;
-    NSMutableArray *bezelConstraints = [NSMutableArray array];
-    NSDictionary *metrics = @{@"margin": @(margin)};
-
-    NSMutableArray *subviews = [NSMutableArray arrayWithObjects:self.topSpacer, self.label, self.detailsLabel, self.button, self.bottomSpacer, nil];
-    if (self.indicator) [subviews insertObject:self.indicator atIndex:1];
-
-    // Remove existing constraints
-    [self removeConstraints:self.constraints];
-    [topSpacer removeConstraints:topSpacer.constraints];
-    [bottomSpacer removeConstraints:bottomSpacer.constraints];
-    if (self.bezelConstraints) {
-        [bezel removeConstraints:self.bezelConstraints];
-        self.bezelConstraints = nil;
-    }
-
-    // Center bezel in container (self), applying the offset if set
-    CGPoint offset = self.offset;
-    NSMutableArray *centeringConstraints = [NSMutableArray array];
-    [centeringConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterX multiplier:1.f constant:offset.x]];
-    [centeringConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeCenterY multiplier:1.f constant:offset.y]];
-    [self applyPriority:998.f toConstraints:centeringConstraints];
-    [self addConstraints:centeringConstraints];
-
-    // Ensure minimum side margin is kept
-    NSMutableArray *sideConstraints = [NSMutableArray array];
-    [sideConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"|-(>=margin)-[bezel]-(>=margin)-|" options:0 metrics:metrics views:NSDictionaryOfVariableBindings(bezel)]];
-    [sideConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=margin)-[bezel]-(>=margin)-|" options:0 metrics:metrics views:NSDictionaryOfVariableBindings(bezel)]];
-    [self applyPriority:999.f toConstraints:sideConstraints];
-    [self addConstraints:sideConstraints];
-
-    // Minimum bezel size, if set
-    CGSize minimumSize = self.minSize;
-    if (!CGSizeEqualToSize(minimumSize, CGSizeZero)) {
-        NSMutableArray *minSizeConstraints = [NSMutableArray array];
-        [minSizeConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:minimumSize.width]];
-        [minSizeConstraints addObject:[NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:minimumSize.height]];
-        [self applyPriority:997.f toConstraints:minSizeConstraints];
-        [bezelConstraints addObjectsFromArray:minSizeConstraints];
-    }
-
-    // Square aspect ratio, if set
-    if (self.square) {
-        NSLayoutConstraint *square = [NSLayoutConstraint constraintWithItem:bezel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeWidth multiplier:1.f constant:0];
-        square.priority = 997.f;
-        [bezelConstraints addObject:square];
-    }
-
-    // Top and bottom spacing
-    [topSpacer addConstraint:[NSLayoutConstraint constraintWithItem:topSpacer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:margin]];
-    [bottomSpacer addConstraint:[NSLayoutConstraint constraintWithItem:bottomSpacer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.f constant:margin]];
-    // Top and bottom spaces should be equal
-    [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:topSpacer attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:bottomSpacer attribute:NSLayoutAttributeHeight multiplier:1.f constant:0.f]];
-
-    // Layout subviews in bezel
-    NSMutableArray *paddingConstraints = [NSMutableArray new];
-    [subviews enumerateObjectsUsingBlock:^(UIView *view, NSUInteger idx, BOOL *stop) {
-        // Center in bezel
-        [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeCenterX multiplier:1.f constant:0.f]];
-        // Ensure the minimum edge margin is kept
-        [bezelConstraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"|-(>=margin)-[view]-(>=margin)-|" options:0 metrics:metrics views:NSDictionaryOfVariableBindings(view)]];
-        // Element spacing
-        if (idx == 0) {
-            // First, ensure spacing to bezel edge
-            [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeTop multiplier:1.f constant:0.f]];
-        } else if (idx == subviews.count - 1) {
-            // Last, ensure spacing to bezel edge
-            [bezelConstraints addObject:[NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:bezel attribute:NSLayoutAttributeBottom multiplier:1.f constant:0.f]];
-        }
-        if (idx > 0) {
-            // Has previous
-            NSLayoutConstraint *padding = [NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:subviews[idx - 1] attribute:NSLayoutAttributeBottom multiplier:1.f constant:0.f];
-            [bezelConstraints addObject:padding];
-            [paddingConstraints addObject:padding];
-        }
-    }];
-
-    [bezel addConstraints:bezelConstraints];
-    self.bezelConstraints = bezelConstraints;
-
-    self.paddingConstraints = [paddingConstraints copy];
-    [self updatePaddingConstraints];
-
-    [super updateConstraints];
-}
-
-- (void)layoutSubviews {
-    // There is no need to update constraints if they are going to
-    // be recreated in [super layoutSubviews] due to needsUpdateConstraints being set.
-    // This also avoids an issue on iOS 8, where updatePaddingConstraints
-    // would trigger a zombie object access.
-    if (!self.needsUpdateConstraints) {
-        [self updatePaddingConstraints];
-    }
-    [super layoutSubviews];
-}
-
-- (void)updatePaddingConstraints {
-    // Set padding dynamically, depending on whether the view is visible or not
-    __block BOOL hasVisibleAncestors = NO;
-    [self.paddingConstraints enumerateObjectsUsingBlock:^(NSLayoutConstraint *padding, NSUInteger idx, BOOL *stop) {
-        UIView *firstView = (UIView *)padding.firstItem;
-        UIView *secondView = (UIView *)padding.secondItem;
-        BOOL firstVisible = !firstView.hidden && !CGSizeEqualToSize(firstView.intrinsicContentSize, CGSizeZero);
-        BOOL secondVisible = !secondView.hidden && !CGSizeEqualToSize(secondView.intrinsicContentSize, CGSizeZero);
-        // Set if both views are visible or if there's a visible view on top that doesn't have padding
-        // added relative to the current view yet
-        padding.constant = (firstVisible && (secondVisible || hasVisibleAncestors)) ? MBDefaultPadding : 0.f;
-        hasVisibleAncestors |= secondVisible;
-    }];
-}
-
-- (void)applyPriority:(UILayoutPriority)priority toConstraints:(NSArray *)constraints {
-    for (NSLayoutConstraint *constraint in constraints) {
-        constraint.priority = priority;
-    }
-}
-
-#pragma mark - Properties
-
-- (void)setMode:(MBProgressHUDMode)mode {
-    if (mode != _mode) {
-        _mode = mode;
-        [self updateIndicators];
-    }
-}
-
-- (void)setCustomView:(UIView *)customView {
-    if (customView != _customView) {
-        _customView = customView;
-        if (self.mode == MBProgressHUDModeCustomView) {
-            [self updateIndicators];
-        }
-    }
-}
-
-- (void)setOffset:(CGPoint)offset {
-    if (!CGPointEqualToPoint(offset, _offset)) {
-        _offset = offset;
-        [self setNeedsUpdateConstraints];
-    }
-}
-
-- (void)setMargin:(CGFloat)margin {
-    if (margin != _margin) {
-        _margin = margin;
-        [self setNeedsUpdateConstraints];
-    }
-}
-
-- (void)setMinSize:(CGSize)minSize {
-    if (!CGSizeEqualToSize(minSize, _minSize)) {
-        _minSize = minSize;
-        [self setNeedsUpdateConstraints];
-    }
-}
-
-- (void)setSquare:(BOOL)square {
-    if (square != _square) {
-        _square = square;
-        [self setNeedsUpdateConstraints];
-    }
-}
-
-- (void)setProgressObjectDisplayLink:(CADisplayLink *)progressObjectDisplayLink {
-    if (progressObjectDisplayLink != _progressObjectDisplayLink) {
-        [_progressObjectDisplayLink invalidate];
-
-        _progressObjectDisplayLink = progressObjectDisplayLink;
-
-        [_progressObjectDisplayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
-    }
-}
-
-- (void)setProgressObject:(NSProgress *)progressObject {
-    if (progressObject != _progressObject) {
-        _progressObject = progressObject;
-        [self setNSProgressDisplayLinkEnabled:YES];
-    }
-}
-
-- (void)setProgress:(float)progress {
-    if (progress != _progress) {
-        _progress = progress;
-        UIView *indicator = self.indicator;
-        if ([indicator respondsToSelector:@selector(setProgress:)]) {
-            [(id)indicator setValue:@(self.progress) forKey:@"progress"];
-        }
-    }
-}
-
-- (void)setContentColor:(UIColor *)contentColor {
-    if (contentColor != _contentColor && ![contentColor isEqual:_contentColor]) {
-        _contentColor = contentColor;
-        [self updateViewsForColor:contentColor];
-    }
-}
-
-- (void)setDefaultMotionEffectsEnabled:(BOOL)defaultMotionEffectsEnabled {
-    if (defaultMotionEffectsEnabled != _defaultMotionEffectsEnabled) {
-        _defaultMotionEffectsEnabled = defaultMotionEffectsEnabled;
-        [self updateBezelMotionEffects];
-    }
-}
-
-#pragma mark - NSProgress
-
-- (void)setNSProgressDisplayLinkEnabled:(BOOL)enabled {
-    // We're using CADisplayLink, because NSProgress can change very quickly and observing it may starve the main thread,
-    // so we're refreshing the progress only every frame draw
-    if (enabled && self.progressObject) {
-        // Only create if not already active.
-        if (!self.progressObjectDisplayLink) {
-            self.progressObjectDisplayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateProgressFromProgressObject)];
-        }
-    } else {
-        self.progressObjectDisplayLink = nil;
-    }
-}
-
-- (void)updateProgressFromProgressObject {
-    self.progress = self.progressObject.fractionCompleted;
-}
-
-#pragma mark - Notifications
-
-- (void)registerForNotifications {
-#if !TARGET_OS_TV && !TARGET_OS_MACCATALYST
-    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-
-    [nc addObserver:self selector:@selector(statusBarOrientationDidChange:)
-               name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
-#endif
-}
-
-- (void)unregisterFromNotifications {
-#if !TARGET_OS_TV && !TARGET_OS_MACCATALYST
-    NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-    [nc removeObserver:self name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
-#endif
-}
-
-#if !TARGET_OS_TV && !TARGET_OS_MACCATALYST
-- (void)statusBarOrientationDidChange:(NSNotification *)notification {
-    UIView *superview = self.superview;
-    if (!superview) {
-        return;
-    } else {
-        [self updateForCurrentOrientationAnimated:YES];
-    }
-}
-#endif
-
-- (void)updateForCurrentOrientationAnimated:(BOOL)animated {
-    // Stay in sync with the superview in any case
-    if (self.superview) {
-        self.frame = self.superview.bounds;
-    }
-
-    // Not needed on iOS 8+, compile out when the deployment target allows,
-    // to avoid sharedApplication problems on extension targets
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-    // Only needed pre iOS 8 when added to a window
-    BOOL iOS8OrLater = kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iOS_8_0;
-    if (iOS8OrLater || ![self.superview isKindOfClass:[UIWindow class]]) return;
-
-    // Make extension friendly. Will not get called on extensions (iOS 8+) due to the above check.
-    // This just ensures we don't get a warning about extension-unsafe API.
-    Class UIApplicationClass = NSClassFromString(@"UIApplication");
-    if (!UIApplicationClass || ![UIApplicationClass respondsToSelector:@selector(sharedApplication)]) return;
-
-    UIApplication *application = [UIApplication performSelector:@selector(sharedApplication)];
-    UIInterfaceOrientation orientation = application.statusBarOrientation;
-    CGFloat radians = 0;
-
-    if (UIInterfaceOrientationIsLandscape(orientation)) {
-        radians = orientation == UIInterfaceOrientationLandscapeLeft ? -(CGFloat)M_PI_2 : (CGFloat)M_PI_2;
-        // Window coordinates differ!
-        self.bounds = CGRectMake(0, 0, self.bounds.size.height, self.bounds.size.width);
-    } else {
-        radians = orientation == UIInterfaceOrientationPortraitUpsideDown ? (CGFloat)M_PI : 0.f;
-    }
-
-    if (animated) {
-        [UIView animateWithDuration:0.3 animations:^{
-            self.transform = CGAffineTransformMakeRotation(radians);
-        }];
-    } else {
-        self.transform = CGAffineTransformMakeRotation(radians);
-    }
-#endif
-}
-
-@end
-
-
-@implementation MBRoundProgressView
-
-#pragma mark - Lifecycle
-
-- (id)init {
-    return [self initWithFrame:CGRectMake(0.f, 0.f, 37.f, 37.f)];
-}
-
-- (id)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.backgroundColor = [UIColor clearColor];
-        self.opaque = NO;
-        _progress = 0.f;
-        _annular = NO;
-        _progressTintColor = [[UIColor alloc] initWithWhite:1.f alpha:1.f];
-        _backgroundTintColor = [[UIColor alloc] initWithWhite:1.f alpha:.1f];
-    }
-    return self;
-}
-
-#pragma mark - Layout
-
-- (CGSize)intrinsicContentSize {
-    return CGSizeMake(37.f, 37.f);
-}
-
-#pragma mark - Properties
-
-- (void)setProgress:(float)progress {
-    if (progress != _progress) {
-        _progress = progress;
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setProgressTintColor:(UIColor *)progressTintColor {
-    NSAssert(progressTintColor, @"The color should not be nil.");
-    if (progressTintColor != _progressTintColor && ![progressTintColor isEqual:_progressTintColor]) {
-        _progressTintColor = progressTintColor;
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setBackgroundTintColor:(UIColor *)backgroundTintColor {
-    NSAssert(backgroundTintColor, @"The color should not be nil.");
-    if (backgroundTintColor != _backgroundTintColor && ![backgroundTintColor isEqual:_backgroundTintColor]) {
-        _backgroundTintColor = backgroundTintColor;
-        [self setNeedsDisplay];
-    }
-}
-
-#pragma mark - Drawing
-
-- (void)drawRect:(CGRect)rect {
-    CGContextRef context = UIGraphicsGetCurrentContext();
-
-    if (_annular) {
-        // Draw background
-        CGFloat lineWidth = 2.f;
-        UIBezierPath *processBackgroundPath = [UIBezierPath bezierPath];
-        processBackgroundPath.lineWidth = lineWidth;
-        processBackgroundPath.lineCapStyle = kCGLineCapButt;
-        CGPoint center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds));
-        CGFloat radius = (self.bounds.size.width - lineWidth)/2;
-        CGFloat startAngle = - ((float)M_PI / 2); // 90 degrees
-        CGFloat endAngle = (2 * (float)M_PI) + startAngle;
-        [processBackgroundPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES];
-        [_backgroundTintColor set];
-        [processBackgroundPath stroke];
-        // Draw progress
-        UIBezierPath *processPath = [UIBezierPath bezierPath];
-        processPath.lineCapStyle = kCGLineCapSquare;
-        processPath.lineWidth = lineWidth;
-        endAngle = (self.progress * 2 * (float)M_PI) + startAngle;
-        [processPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES];
-        [_progressTintColor set];
-        [processPath stroke];
-    } else {
-        // Draw background
-        CGFloat lineWidth = 2.f;
-        CGRect allRect = self.bounds;
-        CGRect circleRect = CGRectInset(allRect, lineWidth/2.f, lineWidth/2.f);
-        CGPoint center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds));
-        [_progressTintColor setStroke];
-        [_backgroundTintColor setFill];
-        CGContextSetLineWidth(context, lineWidth);
-        CGContextStrokeEllipseInRect(context, circleRect);
-        // 90 degrees
-        CGFloat startAngle = - ((float)M_PI / 2.f);
-        // Draw progress
-        UIBezierPath *processPath = [UIBezierPath bezierPath];
-        processPath.lineCapStyle = kCGLineCapButt;
-        processPath.lineWidth = lineWidth * 2.f;
-        CGFloat radius = (CGRectGetWidth(self.bounds) / 2.f) - (processPath.lineWidth / 2.f);
-        CGFloat endAngle = (self.progress * 2.f * (float)M_PI) + startAngle;
-        [processPath addArcWithCenter:center radius:radius startAngle:startAngle endAngle:endAngle clockwise:YES];
-        // Ensure that we don't get color overlapping when _progressTintColor alpha < 1.f.
-        CGContextSetBlendMode(context, kCGBlendModeCopy);
-        [_progressTintColor set];
-        [processPath stroke];
-    }
-}
-
-@end
-
-
-@implementation MBBarProgressView
-
-#pragma mark - Lifecycle
-
-- (id)init {
-    return [self initWithFrame:CGRectMake(.0f, .0f, 120.0f, 20.0f)];
-}
-
-- (id)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        _progress = 0.f;
-        _lineColor = [UIColor whiteColor];
-        _progressColor = [UIColor whiteColor];
-        _progressRemainingColor = [UIColor clearColor];
-        self.backgroundColor = [UIColor clearColor];
-        self.opaque = NO;
-    }
-    return self;
-}
-
-#pragma mark - Layout
-
-- (CGSize)intrinsicContentSize {
-    return CGSizeMake(120.f, 10.f);
-}
-
-#pragma mark - Properties
-
-- (void)setProgress:(float)progress {
-    if (progress != _progress) {
-        _progress = progress;
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setProgressColor:(UIColor *)progressColor {
-    NSAssert(progressColor, @"The color should not be nil.");
-    if (progressColor != _progressColor && ![progressColor isEqual:_progressColor]) {
-        _progressColor = progressColor;
-        [self setNeedsDisplay];
-    }
-}
-
-- (void)setProgressRemainingColor:(UIColor *)progressRemainingColor {
-    NSAssert(progressRemainingColor, @"The color should not be nil.");
-    if (progressRemainingColor != _progressRemainingColor && ![progressRemainingColor isEqual:_progressRemainingColor]) {
-        _progressRemainingColor = progressRemainingColor;
-        [self setNeedsDisplay];
-    }
-}
-
-#pragma mark - Drawing
-
-- (void)drawRect:(CGRect)rect {
-    CGContextRef context = UIGraphicsGetCurrentContext();
-
-    CGContextSetLineWidth(context, 2);
-    CGContextSetStrokeColorWithColor(context,[_lineColor CGColor]);
-    CGContextSetFillColorWithColor(context, [_progressRemainingColor CGColor]);
-
-    // Draw background and Border
-    CGFloat radius = (rect.size.height / 2) - 2;
-    CGContextMoveToPoint(context, 2, rect.size.height/2);
-    CGContextAddArcToPoint(context, 2, 2, radius + 2, 2, radius);
-    CGContextAddArcToPoint(context, rect.size.width - 2, 2, rect.size.width - 2, rect.size.height / 2, radius);
-    CGContextAddArcToPoint(context, rect.size.width - 2, rect.size.height - 2, rect.size.width - radius - 2, rect.size.height - 2, radius);
-    CGContextAddArcToPoint(context, 2, rect.size.height - 2, 2, rect.size.height/2, radius);
-    CGContextDrawPath(context, kCGPathFillStroke);
-
-    CGContextSetFillColorWithColor(context, [_progressColor CGColor]);
-    radius = radius - 2;
-    CGFloat amount = self.progress * rect.size.width;
-
-    // Progress in the middle area
-    if (amount >= radius + 4 && amount <= (rect.size.width - radius - 4)) {
-        CGContextMoveToPoint(context, 4, rect.size.height/2);
-        CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius);
-        CGContextAddLineToPoint(context, amount, 4);
-        CGContextAddLineToPoint(context, amount, radius + 4);
-
-        CGContextMoveToPoint(context, 4, rect.size.height/2);
-        CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius);
-        CGContextAddLineToPoint(context, amount, rect.size.height - 4);
-        CGContextAddLineToPoint(context, amount, radius + 4);
-
-        CGContextFillPath(context);
-    }
-
-    // Progress in the right arc
-    else if (amount > radius + 4) {
-        CGFloat x = amount - (rect.size.width - radius - 4);
-
-        CGContextMoveToPoint(context, 4, rect.size.height/2);
-        CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius);
-        CGContextAddLineToPoint(context, rect.size.width - radius - 4, 4);
-        CGFloat angle = -acos(x/radius);
-        if (isnan(angle)) angle = 0;
-        CGContextAddArc(context, rect.size.width - radius - 4, rect.size.height/2, radius, M_PI, angle, 0);
-        CGContextAddLineToPoint(context, amount, rect.size.height/2);
-
-        CGContextMoveToPoint(context, 4, rect.size.height/2);
-        CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius);
-        CGContextAddLineToPoint(context, rect.size.width - radius - 4, rect.size.height - 4);
-        angle = acos(x/radius);
-        if (isnan(angle)) angle = 0;
-        CGContextAddArc(context, rect.size.width - radius - 4, rect.size.height/2, radius, -M_PI, angle, 1);
-        CGContextAddLineToPoint(context, amount, rect.size.height/2);
-
-        CGContextFillPath(context);
-    }
-
-    // Progress is in the left arc
-    else if (amount < radius + 4 && amount > 0) {
-        CGContextMoveToPoint(context, 4, rect.size.height/2);
-        CGContextAddArcToPoint(context, 4, 4, radius + 4, 4, radius);
-        CGContextAddLineToPoint(context, radius + 4, rect.size.height/2);
-
-        CGContextMoveToPoint(context, 4, rect.size.height/2);
-        CGContextAddArcToPoint(context, 4, rect.size.height - 4, radius + 4, rect.size.height - 4, radius);
-        CGContextAddLineToPoint(context, radius + 4, rect.size.height/2);
-
-        CGContextFillPath(context);
-    }
-}
-
-@end
-
-
-@interface MBBackgroundView ()
-
-@property UIVisualEffectView *effectView;
-
-@end
-
-
-@implementation MBBackgroundView
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
-        _style = MBProgressHUDBackgroundStyleBlur;
-        if (@available(iOS 13.0, *)) {
-            #if TARGET_OS_TV
-            _blurEffectStyle = UIBlurEffectStyleRegular;
-            #else
-            _blurEffectStyle = UIBlurEffectStyleSystemThickMaterial;
-            #endif
-            // Leaving the color unassigned yields best results.
-        } else {
-            _blurEffectStyle = UIBlurEffectStyleLight;
-            _color = [UIColor colorWithWhite:0.8f alpha:0.6f];
-        }
-
-        self.clipsToBounds = YES;
-
-        [self updateForBackgroundStyle];
-    }
-    return self;
-}
-
-#pragma mark - Layout
-
-- (CGSize)intrinsicContentSize {
-    // Smallest size possible. Content pushes against this.
-    return CGSizeZero;
-}
-
-#pragma mark - Appearance
-
-- (void)setStyle:(MBProgressHUDBackgroundStyle)style {
-    if (_style != style) {
-        _style = style;
-        [self updateForBackgroundStyle];
-    }
-}
-
-- (void)setColor:(UIColor *)color {
-    NSAssert(color, @"The color should not be nil.");
-    if (color != _color && ![color isEqual:_color]) {
-        _color = color;
-        [self updateViewsForColor:color];
-    }
-}
-
-- (void)setBlurEffectStyle:(UIBlurEffectStyle)blurEffectStyle {
-    if (_blurEffectStyle == blurEffectStyle) {
-        return;
-    }
-
-    _blurEffectStyle = blurEffectStyle;
-
-    [self updateForBackgroundStyle];
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-#pragma mark - Views
-
-- (void)updateForBackgroundStyle {
-    [self.effectView removeFromSuperview];
-    self.effectView = nil;
-
-    MBProgressHUDBackgroundStyle style = self.style;
-    if (style == MBProgressHUDBackgroundStyleBlur) {
-        UIBlurEffect *effect =  [UIBlurEffect effectWithStyle:self.blurEffectStyle];
-        UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:effect];
-        [self insertSubview:effectView atIndex:0];
-        effectView.frame = self.bounds;
-        effectView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
-        self.backgroundColor = self.color;
-        self.layer.allowsGroupOpacity = NO;
-        self.effectView = effectView;
-    } else {
-        self.backgroundColor = self.color;
-    }
-}
-
-- (void)updateViewsForColor:(UIColor *)color {
-    if (self.style == MBProgressHUDBackgroundStyleBlur) {
-        self.backgroundColor = self.color;
-    } else {
-        self.backgroundColor = self.color;
-    }
-}
-
-@end
-
-
-@implementation MBProgressHUDRoundedButton
-
-#pragma mark - Lifecycle
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        CALayer *layer = self.layer;
-        layer.borderWidth = 1.f;
-    }
-    return self;
-}
-
-#pragma mark - Layout
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    // Fully rounded corners
-    CGFloat height = CGRectGetHeight(self.bounds);
-    self.layer.cornerRadius = ceil(height / 2.f);
-}
-
-- (CGSize)intrinsicContentSize {
-    // Only show if we have associated control events and a title
-    if ((self.allControlEvents == 0) || ([self titleForState:UIControlStateNormal].length == 0))
-		return CGSizeZero;
-    CGSize size = [super intrinsicContentSize];
-    // Add some side padding
-    size.width += 20.f;
-    return size;
-}
-
-#pragma mark - Color
-
-- (void)setTitleColor:(UIColor *)color forState:(UIControlState)state {
-    [super setTitleColor:color forState:state];
-    // Update related colors
-    [self setHighlighted:self.highlighted];
-    self.layer.borderColor = color.CGColor;
-}
-
-- (void)setHighlighted:(BOOL)highlighted {
-    [super setHighlighted:highlighted];
-    UIColor *baseColor = [self titleColorForState:UIControlStateSelected];
-    self.backgroundColor = highlighted ? [baseColor colorWithAlphaComponent:0.1f] : [UIColor clearColor];
-}
-
-@end
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesDetailViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesDetailViewController.swift
index 65c6040..c4b0f0e 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesDetailViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesDetailViewController.swift
@@ -51,7 +51,7 @@ class BBConsentAttributesDetailViewController: BBConsentBaseViewController {
     func changeConsentValue(valueDict:[String: AnyObject]) {
         if self.orgID != nil && consent?.iD != nil{
             NotificationCenter.default.post(name: .consentChange, object: nil)
-            // self.addLoadingIndicator()
+            self.addLoadingIndicator()
             let serviceManager = OrganisationWebServiceManager()
             serviceManager.managerDelegate = self
             serviceManager.updateConsent(orgId: (self.orgID)!, consentID: consentID, attributeId: (consent?.iD)!, purposeId:purposeID, valuesDict: valueDict)
@@ -159,7 +159,7 @@ extension BBConsentAttributesDetailViewController: UITableViewDelegate,UITableVi
 extension BBConsentAttributesDetailViewController: WebServiceTaskManagerProtocol {
     
     func didFinishTask(from manager:AnyObject, response:(data:RestResponse?,error:String?)) {
-        // self.removeLoadingIndicator()
+        self.removeLoadingIndicator()
         if response.error != nil{
             self.showErrorAlert(message: (response.error)!)
             return
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesViewController.swift
index 5bdb515..3c962f3 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentAttributesViewController.swift
@@ -103,7 +103,7 @@ class BBConsentAttributesViewController: BBConsentBaseViewController {
     }
     
     func callConsentListApi() {
-        // self.addLoadingIndicator()
+        self.addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.consentList(orgId: (self.organisaionDeatils?.organization.iD)!, purposeId: (self.purposeInfo?.iD)!, consentId: (self.organisaionDeatils?.consentID)!)
@@ -120,7 +120,7 @@ class BBConsentAttributesViewController: BBConsentBaseViewController {
     }
     
     func callDisallowAllApi(){
-        // self.addLoadingIndicator()
+        self.addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         let value = "Disallow"
@@ -132,7 +132,7 @@ class BBConsentAttributesViewController: BBConsentBaseViewController {
 extension BBConsentAttributesViewController: WebServiceTaskManagerProtocol {
     
     func didFinishTask(from manager:AnyObject, response:(data:RestResponse?,error:String?)){
-        // self.removeLoadingIndicator()
+        self.removeLoadingIndicator()
         
         if response.error != nil {
             self.showErrorAlert(message: (response.error)!)
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentWebViewViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentWebViewViewController.swift
index f041894..9dc1370 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentWebViewViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/AttributesViewController/BBConsentWebViewViewController.swift
@@ -22,7 +22,7 @@ class BBConsentWebViewViewController: BBConsentBaseViewController, WKNavigationD
         backButton.setTitle(" ", for: .normal)
        
         if let url =  URL.init(string: urlString){
-            //self.addLoadingIndicator()
+            self.addLoadingIndicator()
             webview.load(URLRequest.init(url: url))
         }
     }
@@ -42,14 +42,14 @@ class BBConsentWebViewViewController: BBConsentBaseViewController, WKNavigationD
 
     //Equivalent of webViewDidFinishLoad:
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        // self.removeLoadingIndicator()
+        self.removeLoadingIndicator()
         debugPrint("didFinish - webView.url: \(String(describing: webView.url?.description))")
     }
     
     //Equivalent of didFailLoadWithError:
        func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
            let nserror = error as NSError
-            // self.removeLoadingIndicator()
+           self.removeLoadingIndicator()
            if nserror.code != NSURLErrorCancelled {
                webView.loadHTMLString("Page Not Found", baseURL: URL(string: "https://developer.apple.com/"))
            }
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/BaseViewController/BBConsentBaseViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/BaseViewController/BBConsentBaseViewController.swift
index 769c755..9317bef 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/BaseViewController/BBConsentBaseViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/BaseViewController/BBConsentBaseViewController.swift
@@ -9,6 +9,9 @@
 import UIKit
 
 class BBConsentBaseViewController: UIViewController {
+    var spinner = UIActivityIndicatorView(activityIndicatorStyle: .large)
+    var loadingView: UIView = UIView()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
     }
@@ -20,4 +23,31 @@ class BBConsentBaseViewController: UIViewController {
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .darkContent
     }
+    
+    func addLoadingIndicator() {
+        DispatchQueue.main.async {
+            self.loadingView = UIView()
+                   self.loadingView.frame = CGRect(x: 0.0, y: 0.0, width: 100.0, height: 100.0)
+                   self.loadingView.center = self.view.center
+                   self.loadingView.backgroundColor = UIColor(named: "#444444")
+                   self.loadingView.alpha = 0.7
+                   self.loadingView.clipsToBounds = true
+                   self.loadingView.layer.cornerRadius = 10
+
+                   self.spinner = UIActivityIndicatorView(activityIndicatorStyle: .large)
+                   self.spinner.frame = CGRect(x: 0.0, y: 0.0, width: 80.0, height: 80.0)
+                   self.spinner.center = CGPoint(x:self.loadingView.bounds.size.width / 2, y:self.loadingView.bounds.size.height / 2)
+
+                   self.loadingView.addSubview(self.spinner)
+                   self.view.addSubview(self.loadingView)
+                   self.spinner.startAnimating()
+        }
+    }
+    
+    func removeLoadingIndicator() {
+        DispatchQueue.main.async {
+            self.spinner.stopAnimating()
+            self.loadingView.removeFromSuperview()
+        }
+    }
 }
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/ConsentHistory/BBConsentHistoryViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/ConsentHistory/BBConsentHistoryViewController.swift
index 1a6f752..1582400 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/ConsentHistory/BBConsentHistoryViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/ConsentHistory/BBConsentHistoryViewController.swift
@@ -42,7 +42,7 @@ class BBConsentHistoryViewController: BBConsentBaseViewController {
     
 
     func callHistoryListApi(orgID: String) {
-        // self.addLoadingIndicator()
+        self.addLoadingIndicator()
         let serviceManager = NotificationServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getConsentHistoryList()
@@ -52,7 +52,7 @@ class BBConsentHistoryViewController: BBConsentBaseViewController {
 extension BBConsentHistoryViewController: WebServiceTaskManagerProtocol {
     
     func didFinishTask(from manager:AnyObject, response:(data:RestResponse?,error:String?)) {
-        // self.removeLoadingIndicator()
+        self.removeLoadingIndicator()
         
         if response.error != nil {
             self.showErrorAlert(message: (response.error)!)
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/DashBoardViewController/BBConsentOrganisationViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/DashBoardViewController/BBConsentOrganisationViewController.swift
index 2fd3262..2f2d1d6 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/DashBoardViewController/BBConsentOrganisationViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/DashBoardViewController/BBConsentOrganisationViewController.swift
@@ -9,7 +9,7 @@ import Foundation
 import ExpandableLabel
 import SafariServices
 
-class BBConsentOrganisationViewController: UIViewController {
+class BBConsentOrganisationViewController: BBConsentBaseViewController {
     @IBOutlet weak var orgTableView: UITableView!
     @IBOutlet weak var navTitleLbl: UILabel!
     @IBOutlet weak var backBtn: UIButton!
@@ -61,35 +61,35 @@ class BBConsentOrganisationViewController: UIViewController {
     }
     
     func callOrganisationDetailsApi(){
-        // self.addLoadingIndicator()
+        self.addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getOrganisationDetails(orgId: self.organisationId)
     }
     
     func requestForgetMe() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.requestForgetMe(orgId: organisationId)
     }
     
     func requestDownloadData() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.requestDownloadData(orgId: organisationId)
     }
     
     func getDownloadDataStatus() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getDownloadDataStatus(orgId: organisationId)
     }
     
     func getForgetMeStatus() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getForgetMeStatus(orgId: organisationId)
@@ -143,7 +143,7 @@ class BBConsentOrganisationViewController: UIViewController {
     }
     
     @IBAction func allowAllButtonClicked() {
-        // self.addLoadingIndicator()
+        self.addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.allowAllConsentOfOrganisation(orgId: self.organisationId)
@@ -315,7 +315,7 @@ extension BBConsentOrganisationViewController: UITableViewDelegate, UITableViewD
 extension BBConsentOrganisationViewController: WebServiceTaskManagerProtocol {
     
     func didFinishTask(from manager:AnyObject, response:(data:RestResponse?,error:String?)) {
-        // removeLoadingIndicator()
+        removeLoadingIndicator()
         
         if response.error != nil {
             if let serviceManager = manager as? OrganisationWebServiceManager {
@@ -394,7 +394,7 @@ extension BBConsentOrganisationViewController: ExpandableLabelDelegate ,PurposeC
         let alerController = UIAlertController(title: Constant.AppSetupConstant.KAppName, message:alrtMsg , preferredStyle: .alert)
         if status == false {
             alerController.addAction(UIAlertAction(title: titleStr, style: .destructive, handler: {(action:UIAlertAction) in
-                // self.addLoadingIndicator()
+                self.addLoadingIndicator()
                 serviceManager.updatePurpose(orgId: (self.organisaionDeatils?.organization.iD)!, consentID:  (self.organisaionDeatils?.consentID)!, attributeId: "", purposeId: (purposeInfo?.purpose.iD)!, status: value)
             }));
             alerController.addAction(UIAlertAction(title: NSLocalizedString(Constant.Strings.cancel, comment: ""), style: .cancel, handler: {(action:UIAlertAction) in
@@ -407,7 +407,7 @@ extension BBConsentOrganisationViewController: ExpandableLabelDelegate ,PurposeC
             }));
             
             alerController.addAction(UIAlertAction(title: value, style: .default, handler: {(action:UIAlertAction) in
-                // self.addLoadingIndicator()
+                self.addLoadingIndicator()
                 serviceManager.updatePurpose(orgId: (self.organisaionDeatils?.organization.iD)!, consentID:  (self.organisaionDeatils?.consentID)!, attributeId: "", purposeId: (purposeInfo?.purpose.iD)!, status: value)
             }));
         }
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/LoginViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/LoginViewController.swift
index 0245653..744f50a 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/LoginViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/LoginViewController.swift
@@ -175,7 +175,7 @@ extension LoginViewController{
     
     
     func callLoginService(){
-            // self.addLoadingIndicator()
+            self.addLoadingIndicator()
             let serviceManager = LoginServiceManager()
             serviceManager.managerDelegate = self
             serviceManager.loginService(uname: (self.emailTxtFld.text)!, pwd: (self.passwordTxtFld.text)!)
@@ -185,7 +185,7 @@ extension LoginViewController{
 
 extension LoginViewController:WebServiceTaskManagerProtocol,UITextFieldDelegate{
     func didFinishTask(from manager:AnyObject, response:(data:RestResponse?,error:String?)){
-        // self.removeLoadingIndicator()
+        self.removeLoadingIndicator()
         if response.error != nil{
             self.showErrorAlert(message: response.error!)
         }else{
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentDownloadDataProgressViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentDownloadDataProgressViewController.swift
index 27153ef..098f9e3 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentDownloadDataProgressViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentDownloadDataProgressViewController.swift
@@ -8,7 +8,7 @@
 import UIKit
 import StepProgressView
 
-class BBConsentDownloadDataProgressViewController: UIViewController {
+class BBConsentDownloadDataProgressViewController: BBConsentBaseViewController {
     @IBOutlet weak var stepView: StepProgressView!
     var requestStatus: RequestStatus?
     var organisationId: String?
@@ -87,7 +87,7 @@ class BBConsentDownloadDataProgressViewController: UIViewController {
     }
 
     func callCancelRequestApi() {
-        // self.addLoadingIndicator()
+        self.addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.cancelRequest(orgId: self.organisationId ?? "", requestId: self.requestStatus?.iD ?? "", type: self.requestType ?? RequestType.DownloadData)
@@ -95,7 +95,7 @@ class BBConsentDownloadDataProgressViewController: UIViewController {
 }
 extension BBConsentDownloadDataProgressViewController: WebServiceTaskManagerProtocol {
     func didFinishTask(from manager:AnyObject, response:(data:RestResponse?,error:String?)) {
-        // self.removeLoadingIndicator()
+        self.removeLoadingIndicator()
         if response.error != nil{
             self.showErrorAlert(message: (response.error)!)
             return
diff --git a/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentRequestStatusViewController.swift b/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentRequestStatusViewController.swift
index 57c93ed..fb1fb37 100644
--- a/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentRequestStatusViewController.swift
+++ b/PrivacyDashboardiOS/Classes/ViewControllers/RequestViewController/BBConsentRequestStatusViewController.swift
@@ -8,7 +8,7 @@
 import SDStateTableView
 import UIKit
 
-class BBConsentRequestStatusViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
+class BBConsentRequestStatusViewController: BBConsentBaseViewController, UITableViewDataSource, UITableViewDelegate {
     var orgId: String?
     var histories: [RequestStatus]?
     @IBOutlet var historyListTable: SDStateTableView!
@@ -26,14 +26,14 @@ class BBConsentRequestStatusViewController: UIViewController, UITableViewDataSou
     }
     
     func callHistoryListApi() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getRequestedStatus(orgId: orgId ?? "")
     }
 
     func loadMorehistoryListApi(nextUrl: String) {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.isLoadMore = true
@@ -41,35 +41,35 @@ class BBConsentRequestStatusViewController: UIViewController, UITableViewDataSou
     }
 
     func getDownloadDataStatus() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getDownloadDataStatus(orgId: orgId ?? "")
     }
 
     func getForgetMeStatus() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.getForgetMeStatus(orgId: orgId ?? "")
     }
 
     func requestForgetMe() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.requestForgetMe(orgId: orgId ?? "")
     }
 
     func requestDownloadData() {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.requestDownloadData(orgId: orgId ?? "")
     }
 
     func callCancelRequestApi(requestType: RequestType?, requestId: String?) {
-        // addLoadingIndicator()
+        addLoadingIndicator()
         let serviceManager = OrganisationWebServiceManager()
         serviceManager.managerDelegate = self
         serviceManager.cancelRequest(orgId: orgId ?? "", requestId: requestId ?? "", type: requestType ?? RequestType.DownloadData)
@@ -164,7 +164,7 @@ class BBConsentRequestStatusViewController: UIViewController, UITableViewDataSou
 
 extension BBConsentRequestStatusViewController: WebServiceTaskManagerProtocol {
     func didFinishTask(from manager: AnyObject, response: (data: RestResponse?, error: String?)) {
-        // removeLoadingIndicator()
+        removeLoadingIndicator()
         if response.error != nil {
             showErrorAlert(message: (response.error)!)
             return
diff --git a/PrivacyDashboardiOS/Example/Pods/Pods.xcodeproj/project.pbxproj b/PrivacyDashboardiOS/Example/Pods/Pods.xcodeproj/project.pbxproj
index 9351f8d..33b58c2 100644
--- a/PrivacyDashboardiOS/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/PrivacyDashboardiOS/Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -189,10 +189,8 @@
 		9086C52D2AA87D3400C46CF5 /* ConsentListDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C51E2AA87D3400C46CF5 /* ConsentListDetails.swift */; };
 		9086C52E2AA87D3400C46CF5 /* Consent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C51F2AA87D3400C46CF5 /* Consent.swift */; };
 		9086C5312AA87D6800C46CF5 /* ExtensionMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5302AA87D6800C46CF5 /* ExtensionMethods.swift */; };
-		9086C5392AA87E4900C46CF5 /* MBProgressHUD.h in Headers */ = {isa = PBXBuildFile; fileRef = 9086C5332AA87E4900C46CF5 /* MBProgressHUD.h */; };
 		9086C53A2AA87E4900C46CF5 /* UITextField+fixCaretPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5342AA87E4900C46CF5 /* UITextField+fixCaretPosition.swift */; };
 		9086C53B2AA87E4900C46CF5 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5352AA87E4900C46CF5 /* Toast.swift */; };
-		9086C53C2AA87E4900C46CF5 /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5362AA87E4900C46CF5 /* MBProgressHUD.m */; };
 		9086C53D2AA87E4900C46CF5 /* SkyFloatingLabelTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5372AA87E4900C46CF5 /* SkyFloatingLabelTextField.swift */; };
 		9086C53E2AA87E4900C46CF5 /* SkyFloatingLabelTextFieldWithIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5382AA87E4900C46CF5 /* SkyFloatingLabelTextFieldWithIcon.swift */; };
 		9086C5492AA87FA900C46CF5 /* LoginServiceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9086C5412AA87FA900C46CF5 /* LoginServiceManager.swift */; };
@@ -720,10 +718,8 @@
 		9086C51E2AA87D3400C46CF5 /* ConsentListDetails.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsentListDetails.swift; sourceTree = "<group>"; };
 		9086C51F2AA87D3400C46CF5 /* Consent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Consent.swift; sourceTree = "<group>"; };
 		9086C5302AA87D6800C46CF5 /* ExtensionMethods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExtensionMethods.swift; sourceTree = "<group>"; };
-		9086C5332AA87E4900C46CF5 /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
 		9086C5342AA87E4900C46CF5 /* UITextField+fixCaretPosition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextField+fixCaretPosition.swift"; sourceTree = "<group>"; };
 		9086C5352AA87E4900C46CF5 /* Toast.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
-		9086C5362AA87E4900C46CF5 /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
 		9086C5372AA87E4900C46CF5 /* SkyFloatingLabelTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SkyFloatingLabelTextField.swift; sourceTree = "<group>"; };
 		9086C5382AA87E4900C46CF5 /* SkyFloatingLabelTextFieldWithIcon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SkyFloatingLabelTextFieldWithIcon.swift; sourceTree = "<group>"; };
 		9086C5412AA87FA900C46CF5 /* LoginServiceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginServiceManager.swift; sourceTree = "<group>"; };
@@ -1449,8 +1445,6 @@
 		9086C5322AA87E2D00C46CF5 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				9086C5332AA87E4900C46CF5 /* MBProgressHUD.h */,
-				9086C5362AA87E4900C46CF5 /* MBProgressHUD.m */,
 				9086C5372AA87E4900C46CF5 /* SkyFloatingLabelTextField.swift */,
 				9086C5382AA87E4900C46CF5 /* SkyFloatingLabelTextFieldWithIcon.swift */,
 				9086C5352AA87E4900C46CF5 /* Toast.swift */,
@@ -1920,7 +1914,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9086C5392AA87E4900C46CF5 /* MBProgressHUD.h in Headers */,
 				D78E1BEF69D1D8153CAAF360C725FF12 /* PrivacyDashboardiOS-umbrella.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2299,7 +2292,7 @@
 				LastSwiftUpdateCheck = 1300;
 				LastUpgradeCheck = 1300;
 			};
-			buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "_Pods" */;
+			buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -2570,7 +2563,6 @@
 				9086C54B2AA87FA900C46CF5 /* NotificationServiceManager.swift in Sources */,
 				9086C53E2AA87E4900C46CF5 /* SkyFloatingLabelTextFieldWithIcon.swift in Sources */,
 				9086C5262AA87D3400C46CF5 /* PurposeConsent.swift in Sources */,
-				9086C53C2AA87E4900C46CF5 /* MBProgressHUD.m in Sources */,
 				9086C54A2AA87FA900C46CF5 /* LoginWebService.swift in Sources */,
 				9086C5492AA87FA900C46CF5 /* LoginServiceManager.swift in Sources */,
 				9086C5072AA87D1400C46CF5 /* BBConsentAttributesDetailViewController.swift in Sources */,
@@ -3995,7 +3987,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "_Pods" */ = {
+		4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D299434AB35E7FD6F7921C8EF24742FF /* Debug */,