diff --git a/FMC Planner 2/Base.lproj/Main.storyboard b/FMC Planner 2/Base.lproj/Main.storyboard
index a385920..05de0ef 100644
--- a/FMC Planner 2/Base.lproj/Main.storyboard	
+++ b/FMC Planner 2/Base.lproj/Main.storyboard	
@@ -115,13 +115,6 @@
                                     <segue destination="qw7-1R-cA8" kind="push" identifier="Manage" id="Thn-Z7-qri"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="34X-Rk-O8I">
-                                <rect key="frame" x="142" y="224" width="37" height="30"/>
-                                <state key="normal" title="TEST"/>
-                                <connections>
-                                    <action selector="testing:" destination="NBp-hT-qnu" eventType="touchUpInside" id="bcp-H9-7iS"/>
-                                </connections>
-                            </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MYC-QY-v42">
                                 <rect key="frame" x="73" y="72" width="176" height="30"/>
                                 <constraints>
@@ -136,15 +129,12 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="34X-Rk-O8I" firstAttribute="top" secondItem="xba-tH-5D0" secondAttribute="bottom" constant="8" id="0w8-sZ-J4k"/>
                             <constraint firstItem="n9p-C2-IND" firstAttribute="leading" secondItem="Q1M-LV-Smi" secondAttribute="leading" constant="91" id="3OR-Oa-8cl"/>
                             <constraint firstAttribute="trailing" secondItem="n9p-C2-IND" secondAttribute="trailing" constant="91" id="6nb-b2-JUb"/>
                             <constraint firstItem="MYC-QY-v42" firstAttribute="top" secondItem="ggM-lD-yT2" secondAttribute="bottom" constant="8" id="7Aw-oA-8DT"/>
                             <constraint firstAttribute="trailing" secondItem="MYC-QY-v42" secondAttribute="trailing" constant="71" id="9o7-P0-T70"/>
                             <constraint firstItem="MYC-QY-v42" firstAttribute="leading" secondItem="Q1M-LV-Smi" secondAttribute="leading" constant="73" id="Clk-jD-xRP"/>
-                            <constraint firstAttribute="trailing" secondItem="34X-Rk-O8I" secondAttribute="trailing" constant="141" id="GPM-3w-OZI"/>
                             <constraint firstItem="V5o-Hb-Mk0" firstAttribute="leading" secondItem="Q1M-LV-Smi" secondAttribute="leading" constant="73" id="ISQ-lm-JNH"/>
-                            <constraint firstItem="34X-Rk-O8I" firstAttribute="leading" secondItem="Q1M-LV-Smi" secondAttribute="leading" constant="142" id="NW9-dG-lDy"/>
                             <constraint firstItem="xba-tH-5D0" firstAttribute="top" secondItem="V5o-Hb-Mk0" secondAttribute="bottom" constant="8" id="UcB-x5-idK"/>
                             <constraint firstItem="n9p-C2-IND" firstAttribute="top" secondItem="MYC-QY-v42" secondAttribute="bottom" constant="8" id="fvc-m1-XMt"/>
                             <constraint firstItem="xba-tH-5D0" firstAttribute="leading" secondItem="Q1M-LV-Smi" secondAttribute="leading" constant="106" id="gPD-fO-cXe"/>
@@ -156,6 +146,8 @@
                     <navigationItem key="navigationItem" id="74M-cv-MGw"/>
                     <connections>
                         <outlet property="dbConnectButton" destination="MYC-QY-v42" id="SjM-EO-W5v"/>
+                        <outlet property="dbDownload" destination="V5o-Hb-Mk0" id="D1j-Gz-x3j"/>
+                        <outlet property="dbUpload" destination="n9p-C2-IND" id="tIT-Md-AH9"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="PNG-bU-UDR" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/FMC Planner 2/DropboxV2ObjC.h b/FMC Planner 2/DropboxV2ObjC.h
index b089301..b77b0f6 100644
--- a/FMC Planner 2/DropboxV2ObjC.h	
+++ b/FMC Planner 2/DropboxV2ObjC.h	
@@ -30,9 +30,11 @@
 #pragma mark - File and directory methods
 
 - (void)downloadFromDropbox:(NSArray *)files
-                  presenter:(UIViewController *)presenter;
+                  presenter:(UIViewController *)presenter
+                 completion:(void (^)(void))handler;
 - (void)uploadToDropbox:(NSArray *)files
-              presenter:(UIViewController *)presenter;
+              presenter:(UIViewController *)presenter
+             completion:(void (^)(void))handler;
 - (void)contentsOfPath:(NSString *)path
             completion:(void (^)(NSArray *data))handler
              presenter:(UIViewController *)presenter;
diff --git a/FMC Planner 2/DropboxV2ObjC.m b/FMC Planner 2/DropboxV2ObjC.m
index 8d2bebd..1b3c7a0 100644
--- a/FMC Planner 2/DropboxV2ObjC.m	
+++ b/FMC Planner 2/DropboxV2ObjC.m	
@@ -213,6 +213,7 @@
 
 - (void)downloadFromDropbox:(NSArray *)files
                   presenter:(UIViewController *)presenter
+                 completion:(void (^)(void))handler
 {
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
     request.URL = [NSURL
@@ -290,9 +291,12 @@
 
                   }];
     }
+    handler();
 }
 
-- (void)uploadToDropbox:(NSArray *)files presenter:(UIViewController *)presenter
+- (void)uploadToDropbox:(NSArray *)files
+              presenter:(UIViewController *)presenter
+             completion:(void (^)(void))handler
 {
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
     request.URL =
@@ -362,6 +366,7 @@
                       }
                   }];
     }
+    handler();
 }
 
 #pragma mark - Other operations
diff --git a/FMC Planner 2/TableViewController.h b/FMC Planner 2/TableViewController.h
index 59470f7..bb19328 100644
--- a/FMC Planner 2/TableViewController.h	
+++ b/FMC Planner 2/TableViewController.h	
@@ -9,15 +9,17 @@
 #import "AppDelegate.h"
 #import "SharedDeclerations.h"
 #import "ViewController.h"
+#import "ViewControllerServiceMenu.h"
 #import <SWTableViewCell/SWTableViewCell.h>
 #import <UIKit/UIKit.h>
 
-@class ViewController;
+@class ViewControllerServiceMenu;
 @interface TableViewController : UITableViewController <SWTableViewCellDelegate>
 
 #pragma mark - Refrence to other views in app
 
 @property (strong, nonatomic) ViewController *main;
+@property (strong, nonatomic) ViewControllerServiceMenu *sm;
 
 #pragma mark - Table view data source
 
diff --git a/FMC Planner 2/TableViewController.m b/FMC Planner 2/TableViewController.m
index 553dc6e..89bb0aa 100644
--- a/FMC Planner 2/TableViewController.m	
+++ b/FMC Planner 2/TableViewController.m	
@@ -172,11 +172,25 @@ DropboxV2ObjC *dbClient = nil;
 - (void)finishSelection
 {
     if ([self.title isEqualToString:@"Download"]) {
-        [dbClient downloadFromDropbox:_markList presenter:self];
+        _sm.dbDownload.enabled = NO;
+        _sm.dbDownload.alpha = 0.5;
+        [dbClient downloadFromDropbox:_markList
+                            presenter:self
+                           completion:^{
+                               _sm.dbDownload.enabled = YES;
+                               _sm.dbDownload.alpha = 1.0;
+                           }];
         [self.navigationController popViewControllerAnimated:YES];
     }
     if ([self.title isEqualToString:@"Upload"]) {
-        [dbClient uploadToDropbox:_markList presenter:self];
+        _sm.dbUpload.enabled = NO;
+        _sm.dbUpload.alpha = 0.5;
+        [dbClient uploadToDropbox:_markList
+                        presenter:self
+                       completion:^{
+                           _sm.dbUpload.enabled = YES;
+                           _sm.dbUpload.alpha = 1.0;
+                       }];
         [self.navigationController popViewControllerAnimated:YES];
     }
 }
diff --git a/FMC Planner 2/ViewControllerServiceMenu.h b/FMC Planner 2/ViewControllerServiceMenu.h
index 296d047..403c431 100644
--- a/FMC Planner 2/ViewControllerServiceMenu.h	
+++ b/FMC Planner 2/ViewControllerServiceMenu.h	
@@ -19,16 +19,15 @@
 
 @property (strong, nonatomic) ViewController *main;
 
-#pragma mark - Outlet fo Dropbox button
+#pragma mark - Outlet fo Dropbox buttons
 
 @property (strong, nonatomic) IBOutlet UIButton *dbConnectButton;
+@property (strong, nonatomic) IBOutlet UIButton *dbDownload;
+@property (strong, nonatomic) IBOutlet UIButton *dbUpload;
 
 #pragma mark - Dropbox authentictaion methods
 
 - (IBAction)dbConnect:(UIButton *)sender;
 - (IBAction)dbDisconnect:(UIButton *)sender;
 
-#warning TESTING GROUNDS
-- (IBAction)testing:(id)sender;
-
 @end
diff --git a/FMC Planner 2/ViewControllerServiceMenu.m b/FMC Planner 2/ViewControllerServiceMenu.m
index 55b99ba..81b1553 100644
--- a/FMC Planner 2/ViewControllerServiceMenu.m	
+++ b/FMC Planner 2/ViewControllerServiceMenu.m	
@@ -49,6 +49,7 @@
     ((TableViewController *)segue.destinationViewController).title =
         segue.identifier;
     ((TableViewController *)segue.destinationViewController).main = _main;
+    ((TableViewController *)segue.destinationViewController).sm = self;
 }
 
 #pragma mark - Dropbox Button
@@ -88,17 +89,4 @@
                forControlEvents:UIControlEventTouchUpInside];
 }
 
-#warning TESTING GROUNDS
-- (IBAction)testing:(id)sender
-{
-    DropboxV2ObjC *dbClient =
-        ((AppDelegate *)[UIApplication sharedApplication].delegate).dbClient;
-    [dbClient contentsOfPath:nil
-                  completion:^(NSArray *data) {
-                      NSLog(@"%@", data);
-                  }
-                   presenter:self];
-    [dbClient uploadToDropbox:@[ @"EDDFEDDM001" ] presenter:self];
-}
-
 @end