diff --git a/Classes/TaskBagImpl.m b/Classes/TaskBagImpl.m
index b62c346..b97c77c 100644
--- a/Classes/TaskBagImpl.m
+++ b/Classes/TaskBagImpl.m
@@ -222,7 +222,7 @@ - (NSArray*) tasksWithFilter:(id<Filter>)filter withSortOrder:(Sort*)sortOrder {
 	return localTasks;
 }
 
-- (int) size {
+- (NSUInteger) size {
     return [self.tasks count];
 }
 
diff --git a/Libraries/InAppSettingsKit/Models/IASKSettingsStore.h b/Libraries/InAppSettingsKit/Models/IASKSettingsStore.h
index c1b53ba..f081d53 100644
--- a/Libraries/InAppSettingsKit/Models/IASKSettingsStore.h
+++ b/Libraries/InAppSettingsKit/Models/IASKSettingsStore.h
@@ -27,7 +27,7 @@
 - (BOOL)boolForKey:(NSString*)key;
 - (float)floatForKey:(NSString*)key;
 - (double)doubleForKey:(NSString*)key;
-- (int)integerForKey:(NSString*)key;
+- (NSInteger)integerForKey:(NSString*)key;
 - (id)objectForKey:(NSString*)key;
 - (BOOL)synchronize; // Write settings to a permanant storage. Returns YES on success, NO otherwise
 @end
diff --git a/Libraries/InAppSettingsKit/Models/IASKSettingsStore.m b/Libraries/InAppSettingsKit/Models/IASKSettingsStore.m
index 8efbe7d..e37e6a6 100644
--- a/Libraries/InAppSettingsKit/Models/IASKSettingsStore.m
+++ b/Libraries/InAppSettingsKit/Models/IASKSettingsStore.m
@@ -53,7 +53,7 @@ - (BOOL)boolForKey:(NSString*)key {
 - (float)floatForKey:(NSString*)key {
     return [[self objectForKey:key] floatValue];
 }
-- (int)integerForKey:(NSString*)key {
+- (NSInteger)integerForKey:(NSString*)key {
     return [[self objectForKey:key] intValue];
 }
 
diff --git a/Libraries/InAppSettingsKit/Models/IASKSettingsStoreUserDefaults.m b/Libraries/InAppSettingsKit/Models/IASKSettingsStoreUserDefaults.m
index fd24bf0..524eb5a 100644
--- a/Libraries/InAppSettingsKit/Models/IASKSettingsStoreUserDefaults.m
+++ b/Libraries/InAppSettingsKit/Models/IASKSettingsStoreUserDefaults.m
@@ -52,7 +52,7 @@ - (double)doubleForKey:(NSString*)key {
     return [[NSUserDefaults standardUserDefaults] doubleForKey:key];
 }
 
-- (int)integerForKey:(NSString*)key {
+- (NSInteger)integerForKey:(NSString*)key {
     return [[NSUserDefaults standardUserDefaults] integerForKey:key];
 }
 
diff --git a/MainStoryboard_iPad.storyboard b/MainStoryboard_iPad.storyboard
index 9e31432..76fd101 100644
--- a/MainStoryboard_iPad.storyboard
+++ b/MainStoryboard_iPad.storyboard
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="q98-oM-s57">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="q98-oM-s57">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
     </dependencies>
     <scenes>
         <!--Filter View Controller-->
@@ -10,7 +9,7 @@
             <objects>
                 <tableViewController clearsSelectionOnViewWillAppear="NO" id="n6D-qk-G6m" customClass="FilterViewController" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="2gC-So-frt">
-                        <rect key="frame" x="0.0" y="64" width="320" height="788"/>
+                        <rect key="frame" x="0.0" y="64" width="308" height="960"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <connections>
@@ -22,7 +21,7 @@
                     <navigationItem key="navigationItem" id="dO2-cj-bR2">
                         <nil key="title"/>
                         <segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="TAk-NK-2H4">
-                            <rect key="frame" x="72" y="7" width="176" height="31"/>
+                            <rect key="frame" x="66" y="7" width="176" height="31"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <segments>
                                 <segment title="All"/>
@@ -39,7 +38,7 @@
             </objects>
             <point key="canvasLocation" x="967" y="-699"/>
         </scene>
-        <!--Tasks View Controller - Tasks-->
+        <!--Tasks-->
         <scene sceneID="EUl-cx-wIN">
             <objects>
                 <tableViewController id="HNI-em-gnU" customClass="TasksViewController" sceneMemberID="viewController">
@@ -302,7 +301,6 @@
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WELCOME TO" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gu3-9H-8W1">
                                         <rect key="frame" x="12" y="152" width="173" height="28"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" name="Kailasa" family="Kailasa" pointSize="17"/>
                                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                         <nil key="highlightedColor"/>
@@ -348,4 +346,4 @@
         <segue reference="0C1-Ko-UCJ"/>
         <segue reference="I3C-Wc-7PQ"/>
     </inferredMetricsTieBreakers>
-</document>
\ No newline at end of file
+</document>
diff --git a/MainStoryboard_iPhone.storyboard b/MainStoryboard_iPhone.storyboard
index b6d0190..26925f3 100644
--- a/MainStoryboard_iPhone.storyboard
+++ b/MainStoryboard_iPhone.storyboard
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="qhX-d2-2Zl">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="qhX-d2-2Zl">
     <dependencies>
-        <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
     </dependencies>
     <scenes>
-        <!--Tasks View Controller - Tasks-->
+        <!--Tasks-->
         <scene sceneID="hEa-Ai-Hkk">
             <objects>
                 <tableViewController id="yWi-bb-L3m" customClass="TasksViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="C2e-rl-6C1" customClass="PGTableViewWithEmptyView">
-                        <rect key="frame" x="0.0" y="64" width="320" height="460"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <searchBar key="tableHeaderView" contentMode="redraw" id="nbM-XI-PVk">
@@ -140,11 +139,11 @@
                         <viewControllerLayoutGuide type="bottom" id="slH-Ei-121"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="dL4-LZ-GNA">
-                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wK2-0X-9fN" customClass="SSTextView">
-                                <rect key="frame" x="0.0" y="-32" width="320" height="568"/>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wK2-0X-9fN" customClass="SSTextView">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -240,7 +239,6 @@
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WELCOME TO" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nPc-3Q-q7s">
                                 <rect key="frame" x="20" y="195" width="173" height="28"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" name="Kailasa" family="Kailasa" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
@@ -267,7 +265,7 @@
             <objects>
                 <tableViewController id="ZMT-wH-wbl" customClass="FilterViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="k99-Yx-ghR">
-                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                     </tableView>
@@ -332,4 +330,4 @@
         <segue reference="nZn-YM-cqf"/>
         <segue reference="pCm-z6-2l4"/>
     </inferredMetricsTieBreakers>
-</document>
\ No newline at end of file
+</document>
diff --git a/Protocols/TaskBag.h b/Protocols/TaskBag.h
index 0a953c1..ccbe92b 100644
--- a/Protocols/TaskBag.h
+++ b/Protocols/TaskBag.h
@@ -62,7 +62,7 @@
 - (NSUInteger) indexOfTask:(Task*)task;
 - (NSArray*) tasksWithFilter:(id<Filter>)filter withSortOrder:(Sort*)sortOrder;
 
-@property (readonly) int size;
+@property (readonly) NSUInteger size;
 @property (nonatomic, readonly) NSArray *tasks;
 @property (nonatomic, readonly) NSArray *projects;
 @property (nonatomic, readonly) NSArray *contexts;