diff --git a/TableView/HomeViewController.h b/TableView/HomeViewController.h
index e8787a4..72de00e 100644
--- a/TableView/HomeViewController.h
+++ b/TableView/HomeViewController.h
@@ -13,6 +13,7 @@
 {
 
     IBOutlet UITextView *homeText;
+    __weak IBOutlet NSLayoutConstraint *homeTextBottomConstraint;
 }
 - (void)checkForWIFIConnection;
 
diff --git a/TableView/HomeViewController.m b/TableView/HomeViewController.m
index 3102bdb..c9120a4 100644
--- a/TableView/HomeViewController.m
+++ b/TableView/HomeViewController.m
@@ -33,6 +33,10 @@ - (void)viewDidLoad
     [super viewDidLoad];
     
     [self checkReachability];
+    
+    if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_6_1) {
+        homeTextBottomConstraint.constant = 0; // This constraint is only needed on iOS 7.
+    }
 }
 
 -(void)viewDidAppear:(BOOL)animated{
diff --git a/TableView/HomeViewController.xib b/TableView/HomeViewController.xib
index f6cecc0..503f78c 100644
--- a/TableView/HomeViewController.xib
+++ b/TableView/HomeViewController.xib
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12E55" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
+        <deployment defaultVersion="1552" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="HomeViewController">
             <connections>
                 <outlet property="homeText" destination="50" id="63"/>
+                <outlet property="homeTextBottomConstraint" destination="KZ3-RV-UVq" id="g58-bZ-ycv"/>
                 <outlet property="view" destination="1" id="3"/>
             </connections>
         </placeholder>
diff --git a/TableView/MasterViewController.m b/TableView/MasterViewController.m
index e3653a2..caa1ed8 100644
--- a/TableView/MasterViewController.m
+++ b/TableView/MasterViewController.m
@@ -207,7 +207,11 @@ - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
     [aSearchBar resignFirstResponder];
     isFiltered = NO;
     aSearchBar.backgroundColor = [UIColor lightGrayColor];
-    [self.tableView setContentOffset:CGPointMake(0,-20) animated:YES];
+    if (floor(NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_6_1)) {
+        [self.tableView setContentOffset:CGPointMake(0, 44) animated:YES];
+    } else {
+        [self.tableView setContentOffset:CGPointMake(0,-20) animated:YES];
+    }
     [self.tableView reloadData];
 }
 
diff --git a/TableView/SecondDetailViewController.h b/TableView/SecondDetailViewController.h
index 75c7985..2123b0b 100644
--- a/TableView/SecondDetailViewController.h
+++ b/TableView/SecondDetailViewController.h
@@ -17,7 +17,7 @@
     IBOutlet UITextView *runnersInfo;
     IBOutlet UIPickerView *secondPicker;
     NSUInteger selectedRow;
-    
+    CGRect runnersInfoOriginalFrame;
 
 }
 @property (strong, nonatomic) UIView *myView;
diff --git a/TableView/SecondDetailViewController.m b/TableView/SecondDetailViewController.m
index d0fbee9..13375c3 100644
--- a/TableView/SecondDetailViewController.m
+++ b/TableView/SecondDetailViewController.m
@@ -49,9 +49,12 @@ - (void)viewDidLoad
     self.navigationItem.rightBarButtonItem = addButton;
     addButton.tintColor = [UIColor colorWithRed:(25/255.0) green:(200/250.0) blue:(110/255.0) alpha:1];
     
-    
+    runnersInfoOriginalFrame = CGRectMake(0, 216, 320, 238);
 }
 
+- (void)viewWillDisappear:(BOOL)animated {
+    [runnersInfo scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
+}
 
 - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
 {
@@ -199,7 +202,21 @@ - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
 
 - (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
 {
-    return [[self.run.videoLinks objectForKey:@"PickerItems"] count];
+    int numberOfVideoLinks = [[self.run.videoLinks objectForKey:@"PickerItems"] count];
+    
+    if (numberOfVideoLinks == 1) {
+        pickerView.hidden = YES;
+        if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_6_1) {
+            runnersInfo.frame = self.view.frame;
+        } else {
+            runnersInfo.frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height - 44 - 49 - 20); // In iOS 7; the navigation bar (44 points), tab bar (49 points) and status bar (20 points) are considered areas that can display content. Modifying the frame of the text view to not be blocked by any of these. 
+        }
+    } else if (numberOfVideoLinks > 1) {
+        pickerView.hidden = NO;
+        runnersInfo.frame = runnersInfoOriginalFrame;
+    }
+    
+    return numberOfVideoLinks;
 }
 
 - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component