diff --git a/OpenStack Summit/CoreSummit/FeedbackRequest.swift b/OpenStack Summit/CoreSummit/FeedbackRequest.swift
index c9eb62cf..641832f7 100644
--- a/OpenStack Summit/CoreSummit/FeedbackRequest.swift	
+++ b/OpenStack Summit/CoreSummit/FeedbackRequest.swift	
@@ -92,7 +92,7 @@ public extension Store {
                     
                     managedObject.averageFeedback = averageFeedback
                     
-                    try context.validateAndSave()
+                    try context.save()
                 }
             }
             
diff --git a/OpenStack Summit/CoreSummit/Level.swift b/OpenStack Summit/CoreSummit/Level.swift
new file mode 100644
index 00000000..2567f886
--- /dev/null
+++ b/OpenStack Summit/CoreSummit/Level.swift	
@@ -0,0 +1,37 @@
+//
+//  Level.swift
+//  OpenStack Summit
+//
+//  Created by Gabriel Horacio Cutrini on 4/18/17.
+//  Copyright © 2017 OpenStack. All rights reserved.
+//
+
+public enum Level: String, Comparable {
+    
+    case Beginner
+    case Intermediate
+    case Advanced
+    case NotApplicable = "N/A"
+    
+    public var order: Int {
+        
+        switch self {
+        case .Beginner: return 0
+        case .Intermediate: return 1
+        case .Advanced: return 2
+        case .NotApplicable: return 3
+        }
+    }
+}
+
+// MARK: - Comparable
+
+public func == (lhs: Level, rhs: Level) -> Bool {
+    
+    return lhs.order == rhs.order
+}
+
+public func < (lhs: Level, rhs: Level) -> Bool {
+    
+    return lhs.order < rhs.order
+}
diff --git a/OpenStack Summit/CoreSummit/Presentation.swift b/OpenStack Summit/CoreSummit/Presentation.swift
index 8e4b102f..498147f7 100644
--- a/OpenStack Summit/CoreSummit/Presentation.swift	
+++ b/OpenStack Summit/CoreSummit/Presentation.swift	
@@ -17,19 +17,6 @@ public struct Presentation: Unique, Equatable {
     public var speakers: Set<Identifier>
 }
 
-// MARK: - Supporting Types
-
-public extension Presentation {
-    
-    public enum Level: String {
-        
-        case Beginner
-        case Intermediate
-        case Advanced
-        case NotApplicable = "N/A"
-    }
-}
-
 // MARK: - Equatable
 
 public func == (lhs: Presentation, rhs: Presentation) -> Bool {
diff --git a/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift b/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift
index b4e91462..97c88086 100644
--- a/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationDataUpdate.swift	
@@ -10,7 +10,7 @@ public struct PresentationDataUpdate: Unique {
     
     public let identifier: Identifier
     
-    public let level: Presentation.Level?
+    public let level: Level?
     
     public let moderator: Identifier?
     
diff --git a/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift b/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift
index 25321d09..55083c23 100644
--- a/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift	
+++ b/OpenStack Summit/CoreSummit/PresentationDataUpdateJSON.swift	
@@ -36,7 +36,7 @@ extension PresentationDataUpdate: JSONDecodable {
         
         if let levelString = JSONObject[JSONKey.level.rawValue]?.rawValue as? String {
             
-            guard let level = Presentation.Level(rawValue: levelString)
+            guard let level = Level(rawValue: levelString)
                 else { return nil }
             
             self.level = level
diff --git a/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj b/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj
index bd9151d6..c05073e8 100644
--- a/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj	
+++ b/OpenStack Summit/OpenStack Summit.xcodeproj/project.pbxproj	
@@ -1074,6 +1074,10 @@
 		9DABFF941DA6A75B00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
 		9DABFF951DA6A75C00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
 		9DABFF961DA6A75E00B3101A /* VenueFloorJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */; };
+		9DEF130D1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
+		9DEF130E1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
+		9DEF130F1EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
+		9DEF13101EA67153001798D4 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DEF130C1EA67153001798D4 /* Level.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -1758,6 +1762,7 @@
 		6EFE54EB1E612BDD005EAB86 /* JSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JSON.framework; sourceTree = "<group>"; };
 		6EFE54EF1E612BDD005EAB86 /* SwiftFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftFoundation.framework; sourceTree = "<group>"; };
 		6EFE54F11E612BDD005EAB86 /* XCDYouTubeKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCDYouTubeKit.framework; sourceTree = "<group>"; };
+		9D13D0A51EB39C3D00991DD2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		9D1CE1051DA43DCF0064B3B1 /* VenueFloor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueFloor.swift; sourceTree = "<group>"; };
 		9D1CE1071DA48BB60064B3B1 /* VenueFloorJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueFloorJSON.swift; sourceTree = "<group>"; };
 		9D4B1C231E84B01F00F98ECB /* AffiliationOrganization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AffiliationOrganization.swift; sourceTree = "<group>"; };
@@ -1770,6 +1775,7 @@
 		9D6AADA81DBE4ABE0057888E /* DataUpdates6.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = DataUpdates6.json; sourceTree = "<group>"; };
 		9D6AADAB1DBE563A0057888E /* VenueRoomDataUpdateJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueRoomDataUpdateJSON.swift; sourceTree = "<group>"; };
 		9D6AADAD1DBE56CB0057888E /* VenueRoomDataUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VenueRoomDataUpdate.swift; sourceTree = "<group>"; };
+		9DEF130C1EA67153001798D4 /* Level.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Level.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2010,9 +2016,9 @@
 				6E9B22D71D40171800D25271 /* Venue.storyboard */,
 				6E8D109C1DF8957100A0BBDC /* Teams.storyboard */,
 				6EEED02C1E3A4DAD00795B3D /* Notifications.storyboard */,
+				6ED495821D792F7800749940 /* Debug.entitlements */,
 				6E5BE4191D76996600E323D3 /* Beta.entitlements */,
 				6ED495811D792F7800749940 /* Release.entitlements */,
-				6ED495821D792F7800749940 /* Debug.entitlements */,
 				6E104D3D1D1061AC00541E84 /* Info.plist */,
 				6E5DEDB51E2D300C00F45602 /* GoogleServices */,
 				6EF147ED1D1357A100D5EEF9 /* Controller */,
@@ -2107,6 +2113,7 @@
 				6E10A52B1D10675C008CBD0C /* NonConfirmedAttendee.swift */,
 				6E10A52D1D10675C008CBD0C /* Person.swift */,
 				6E10A52E1D10675C008CBD0C /* Presentation.swift */,
+				9DEF130C1EA67153001798D4 /* Level.swift */,
 				6E10A5301D10675C008CBD0C /* Speaker.swift */,
 				6E10A5481D10675C008CBD0C /* Summit.swift */,
 				6E10A5491D10675C008CBD0C /* Attendee.swift */,
@@ -2403,8 +2410,9 @@
 		6E5DEDB51E2D300C00F45602 /* GoogleServices */ = {
 			isa = PBXGroup;
 			children = (
-				6EEED02F1E3A60E900795B3D /* Beta */,
 				6E5DEDB61E2D300C00F45602 /* Debug */,
+				6EEED02F1E3A60E900795B3D /* Beta */,
+				9D13D0A41EB39C3D00991DD2 /* Release */,
 			);
 			path = GoogleServices;
 			sourceTree = SOURCE_ROOT;
@@ -2937,6 +2945,14 @@
 			path = ../../Carthage/Build/Mac;
 			sourceTree = "<group>";
 		};
+		9D13D0A41EB39C3D00991DD2 /* Release */ = {
+			isa = PBXGroup;
+			children = (
+				9D13D0A51EB39C3D00991DD2 /* GoogleService-Info.plist */,
+			);
+			path = Release;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -3980,6 +3996,7 @@
 				6EE954551E92A0BC006B1330 /* Compound.swift in Sources */,
 				6EB1FDF51E1C073E0048045D /* TeamInvitationRequest.swift in Sources */,
 				6EBC49051E1394FE0077806B /* TeamMessageJSON.swift in Sources */,
+				9DEF13101EA67153001798D4 /* Level.swift in Sources */,
 				9DABFF911DA6A74C00B3101A /* VenueFloor.swift in Sources */,
 				6E0B5F0A1D77C8950005F6CE /* Video.swift in Sources */,
 				6E1BCFF11E37A5FE00059E94 /* MemberJSON.swift in Sources */,
@@ -4169,6 +4186,7 @@
 				6EF4F86B1DC8D1D300D31A99 /* CoreDataDecodable.swift in Sources */,
 				6E10A58C1D10675D008CBD0C /* Attendee.swift in Sources */,
 				6EFC6E691D2322E70087057A /* EventScheduleRequest.swift in Sources */,
+				9DEF130D1EA67153001798D4 /* Level.swift in Sources */,
 				6E10A55F1D10675D008CBD0C /* ErrorValue.swift in Sources */,
 				6E570A361D67753D00189992 /* PresentationDataUpdate.swift in Sources */,
 				9D6AADB21DBE58030057888E /* VenueRoomDataUpdateJSON.swift in Sources */,
@@ -4401,6 +4419,7 @@
 				6E2923D21D7AF8C900D14F0A /* Configuration.swift in Sources */,
 				6E2923D31D7AF8C900D14F0A /* EventType.swift in Sources */,
 				6E2923D41D7AF8C900D14F0A /* Venue.swift in Sources */,
+				9DEF130F1EA67153001798D4 /* Level.swift in Sources */,
 				6E2923D51D7AF8C900D14F0A /* TicketTypeJSON.swift in Sources */,
 				6E2923D61D7AF8C900D14F0A /* TicketOrderRequest.swift in Sources */,
 				6E99B8AB1DC7D68F009CE28D /* Model.xcdatamodeld in Sources */,
@@ -4533,6 +4552,7 @@
 				6E7557B81E58C48C003B6844 /* CoreDataDecodable.swift in Sources */,
 				6E7557B91E58C48C003B6844 /* Attendee.swift in Sources */,
 				6E7557BA1E58C48C003B6844 /* EventScheduleRequest.swift in Sources */,
+				9DEF130E1EA67153001798D4 /* Level.swift in Sources */,
 				6E7557BB1E58C48C003B6844 /* ErrorValue.swift in Sources */,
 				6E7557BC1E58C48C003B6844 /* PresentationDataUpdate.swift in Sources */,
 				6E7557BD1E58C48C003B6844 /* VenueRoomDataUpdateJSON.swift in Sources */,
diff --git a/OpenStack Summit/OpenStack Summit/AppDelegate.swift b/OpenStack Summit/OpenStack Summit/AppDelegate.swift
index 046d5f9b..2a85ace4 100644
--- a/OpenStack Summit/OpenStack Summit/AppDelegate.swift	
+++ b/OpenStack Summit/OpenStack Summit/AppDelegate.swift	
@@ -167,7 +167,12 @@ final class AppDelegate: UIResponder, UIApplicationDelegate, SummitActivityHandl
         // Print full message.
         print("Recieved remote notification: \(userInfo)")
         
-        PushNotificationManager.shared.process(userInfo as! [String: String])
+        var notification = userInfo
+        notification.removeValueForKey("aps")
+        
+        if let notification = notification as? [String: String] {
+            PushNotificationManager.shared.process(notification)
+        }
         
         completionHandler(.NewData)
     }
diff --git a/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift b/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift
index 12d4851c..09625e95 100644
--- a/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/AttendeeConfirmViewController.swift	
@@ -277,6 +277,8 @@ final class AttendeeConfirmViewController: UITableViewController, MessageEnabled
             
             let cell = tableView.dequeueReusableCellWithIdentifier(R.reuseIdentifier.attendeeConfirmSelectionTableViewCell)!
             
+            cell.pickerView.reloadAllComponents()
+            
             return cell
             
         case .action:
diff --git a/OpenStack Summit/OpenStack Summit/Event.storyboard b/OpenStack Summit/OpenStack Summit/Event.storyboard
index cc4b0bec..6ad3f77c 100644
--- a/OpenStack Summit/OpenStack Summit/Event.storyboard	
+++ b/OpenStack Summit/OpenStack Summit/Event.storyboard	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="SnY-ae-Z8a">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="SnY-ae-Z8a">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -188,9 +188,9 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jpM-DJ-szI">
-                                            <rect key="frame" x="83" y="15" width="155" height="22"/>
+                                            <rect key="frame" x="68" y="15" width="184" height="22"/>
                                             <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="17"/>
-                                            <state key="normal" title="Download Keynote">
+                                            <state key="normal" title="Download attachment">
                                                 <color key="titleColor" red="0.12941176470588234" green="0.25098039215686274" blue="0.396078431372549" alpha="1" colorSpace="calibratedRGB"/>
                                             </state>
                                             <connections>
@@ -385,7 +385,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="99 years ago" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YT4-VH-XAh">
-                                            <rect key="frame" x="16" y="16" width="79" height="18"/>
+                                            <rect key="frame" x="16" y="16" width="78.5" height="18"/>
                                             <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="13"/>
                                             <color key="textColor" red="0.59607843137254901" green="0.59607843137254901" blue="0.59607843137254901" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
@@ -480,19 +480,19 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="OTu-1p-7i2">
-                            <rect key="frame" x="15" y="40" width="290" height="122.5"/>
+                            <rect key="frame" x="15" y="40" width="290" height="123"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="EvU-ad-cf6">
-                                    <rect key="frame" x="0.0" y="0.0" width="290" height="57.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="290" height="58"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rgm-5C-23d" customClass="CopyableLabel" customModule="OpenStackSummit" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="290" height="27.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="290" height="28"/>
                                             <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="20"/>
                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Track" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dLH-lM-hPM" userLabel="Track" customClass="CopyableLabel" customModule="OpenStackSummit" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="35.5" width="290" height="22"/>
+                                            <rect key="frame" x="0.0" y="36" width="290" height="22"/>
                                             <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="16"/>
                                             <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
@@ -500,13 +500,13 @@
                                     </subviews>
                                 </stackView>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FET-XF-DJx">
-                                    <rect key="frame" x="0.0" y="87.5" width="290" height="35"/>
+                                    <rect key="frame" x="0.0" y="88" width="290" height="35"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="9LM-7x-arF">
                                             <rect key="frame" x="0.0" y="0.0" width="290" height="35"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YHq-I5-oVn" customClass="EventDetailActionButton" customModule="OpenStackSummit" customModuleProvider="target">
-                                                    <rect key="frame" x="0.0" y="0.0" width="95.5" height="35"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="95" height="35"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="35" id="2pZ-pX-wIE"/>
                                                     </constraints>
@@ -529,7 +529,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Czs-tP-hWr" customClass="EventDetailActionButton" customModule="OpenStackSummit" customModuleProvider="target">
-                                                    <rect key="frame" x="97.5" y="0.0" width="95" height="35"/>
+                                                    <rect key="frame" x="97" y="0.0" width="96" height="35"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="35" id="MDd-hu-Ci1"/>
                                                     </constraints>
@@ -552,7 +552,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kTd-Ix-Da9" customClass="EventDetailActionButton" customModule="OpenStackSummit" customModuleProvider="target">
-                                                    <rect key="frame" x="194.5" y="0.0" width="95.5" height="35"/>
+                                                    <rect key="frame" x="195" y="0.0" width="95" height="35"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="35" id="Ppc-CQ-XNI"/>
                                                     </constraints>
@@ -614,7 +614,7 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="I8l-E2-m9Q">
-                            <rect key="frame" x="201.5" y="32" width="20" height="20"/>
+                            <rect key="frame" x="201" y="32" width="20" height="20"/>
                         </activityIndicatorView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99 REVIEWS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IqD-sa-FyG">
                             <rect key="frame" x="20" y="28" width="95" height="24"/>
@@ -629,7 +629,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NNU-Ei-sIC" customClass="CosmosView" customModule="Cosmos">
-                            <rect key="frame" x="158.5" y="31" width="105" height="21"/>
+                            <rect key="frame" x="158" y="31" width="105" height="21"/>
                             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             <accessibility key="accessibilityConfiguration">
                                 <accessibilityTraits key="traits" notEnabled="YES"/>
@@ -690,16 +690,16 @@
                     <rect key="frame" x="0.0" y="0.0" width="320" height="247"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mPR-rc-lJ2">
-                            <rect key="frame" x="20" y="87" width="280" height="41"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mPR-rc-lJ2">
+                            <rect key="frame" x="20" y="99" width="280" height="41"/>
                             <string key="text">There are no reviews so far.
 Be the first to rate this event.</string>
                             <fontDescription key="fontDescription" name="OpenSans" family="Open Sans" pointSize="15"/>
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kc7-Wa-3Nh" customClass="Button" customModule="OpenStackSummit" customModuleProvider="target">
-                            <rect key="frame" x="15" y="172" width="290" height="50"/>
+                        <button clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kc7-Wa-3Nh" customClass="Button" customModule="OpenStackSummit" customModuleProvider="target">
+                            <rect key="frame" x="15" y="170" width="290" height="50"/>
                             <color key="backgroundColor" red="0.18823529410000001" green="0.45098039220000002" blue="0.61176470589999998" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="50" id="aFg-kG-GwT"/>
diff --git a/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift b/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift
index 187db9ea..0a887b66 100755
--- a/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventDetailViewController.swift	
@@ -235,12 +235,16 @@ final class EventDetailViewController: UITableViewController, EventViewControlle
         titleHeader.trackLabel.textColor = UIColor(hexString: eventDetail.trackGroupColor) ?? .whiteColor()
         titleHeader.trackLabel.hidden = eventDetail.track.isEmpty
         
+        titleHeader.scheduleButton.setTitle(eventDetail.rsvp.isEmpty ? "Schedule" : "RSVP", forState: .Normal)
+        
         let didConfirm = Store.shared.isEventScheduledByLoggedMember(event: event)
         let isFavorite = Store.shared.authenticatedMember?.isFavorite(event: event) ?? false
         
         titleHeader.scheduleButton.highlighted = didConfirm
         titleHeader.favoriteButton.highlighted = isFavorite
         
+        titleHeader.favoriteButton.hidden = !eventDetail.willRecord
+
         // action buttons
         
         // get all reviews for this event
diff --git a/OpenStack Summit/OpenStack Summit/EventViewController.swift b/OpenStack Summit/OpenStack Summit/EventViewController.swift
index d337b337..cddaf7f1 100644
--- a/OpenStack Summit/OpenStack Summit/EventViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/EventViewController.swift	
@@ -25,8 +25,7 @@ extension EventViewController {
     func canAddFeedback(for event: EventDetail) -> Bool {
         
         // Can give feedback after event started
-        return Store.shared.isLoggedIn
-            && event.allowFeedback
+        return event.allowFeedback
             && event.start < Date()
     }
     
@@ -50,7 +49,7 @@ extension EventViewController {
         
         var actions: [ContextMenu.Action] = []
         
-        if canAddFeedback(for: event) {
+        if Store.shared.isLoggedIn && canAddFeedback(for: event) {
             
             let rate = ContextMenu.Action(activityType: "Event.Rate", image: { R.image.contextMenuRate()! }, title: "Rate", handler: .modal({ [weak self] (didComplete) -> UIViewController in
                 
@@ -66,7 +65,12 @@ extension EventViewController {
             
             let newValue = scheduled == false
             
-            let title = newValue ? "Schedule" : "Unschedule"
+            var title = newValue ? "Schedule" : "Unschedule"
+            
+            if !event.rsvp.isEmpty {
+                
+                title = newValue ? "RSVP" : "unRSVP"
+            }
             
             let image = newValue ? R.image.contextMenuScheduleAdd()! : R.image.contextMenuScheduleRemove()!
             
@@ -84,7 +88,7 @@ extension EventViewController {
         
         let isFavorite = Store.shared.authenticatedMember?.isFavorite(event: event.identifier) ?? false
         
-        if Store.shared.isLoggedIn && eventRequestInProgress == false {
+        if Store.shared.isLoggedIn && event.willRecord && eventRequestInProgress == false {
             
             let newValue = isFavorite == false
             
diff --git a/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift b/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift
index 5789819d..3166de8c 100644
--- a/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/FavoriteEventsViewController.swift	
@@ -47,12 +47,13 @@ final class FavoriteEventsViewController: ScheduleViewController, IndicatorInfoP
     
     override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
         
-        guard let member = Store.shared.authenticatedMember
+        guard let member = Store.shared.authenticatedMember,
+            case .interval(let interval) = filter
             else { return [] }
         
         let events = member.favoriteEvents
-            .filter({ Date(foundation: $0.start) >= Date(foundation: startDate)
-                && Date(foundation: $0.end) <= Date(foundation: endDate) })
+            .filter({ Date(foundation: $0.start) >= interval.start
+                && Date(foundation: $0.end) <= interval.end })
             .sort({ Date(foundation: $0.0.start) < Date(foundation: $0.1.start) })
         
         return ScheduleItem.from(managedObjects: events)
diff --git a/OpenStack Summit/OpenStack Summit/Filter.swift b/OpenStack Summit/OpenStack Summit/Filter.swift
index c0a1c597..4274e422 100644
--- a/OpenStack Summit/OpenStack Summit/Filter.swift	
+++ b/OpenStack Summit/OpenStack Summit/Filter.swift	
@@ -94,9 +94,11 @@ struct ScheduleFilter: Equatable {
         // fetch data
         let trackGroups = try! TrackGroup.scheduled(for: summitID, context: context)
         let levels = try! Set(context.managedObjects(PresentationManagedObject.self, predicate: "event.summit.id" == summitID)
-            .map({ $0.level ?? "" }))
-            .filter({ $0 != "" })
-            .sort()
+            .flatMap { $0.level })
+            .flatMap { Level(rawValue: $0) }
+            .sort { (lhs: Level, rhs: Level) -> Bool in lhs < rhs }
+            .map { $0.rawValue }
+        
         let venues = try! context.managedObjects(Venue.self, predicate: NSPredicate(format: "summit == %@", summit), sortDescriptors: VenueManagedObject.sortDescriptors)
         
         // populate filter categories
diff --git a/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift b/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift
index 3f01e2d7..a4de4966 100644
--- a/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/GeneralScheduleFilterViewController.swift	
@@ -110,13 +110,6 @@ final class GeneralScheduleFilterViewController: UITableViewController {
             filters.append(Section(category: .activeTalks, items: items))
         }
         
-        if let levelsSection = scheduleFilter.allFilters[.level] {
-            
-            let items = levelsSection.map { Item(filter: $0, enabled: scheduleFilter.activeFilters.contains($0), name: name(for: $0), color: nil) }
-            
-            filters.append(Section(category: .level, items: items))
-        }
-        
         if let trackGroupsSection = scheduleFilter.allFilters[.trackGroup] {
             
             // fetch from CoreData because it caches fetch request results and is more efficient
@@ -131,6 +124,13 @@ final class GeneralScheduleFilterViewController: UITableViewController {
             filters.append(Section(category: .trackGroup, items: items))
         }
         
+        if let levelsSection = scheduleFilter.allFilters[.level] {
+            
+            let items = levelsSection.map { Item(filter: $0, enabled: scheduleFilter.activeFilters.contains($0), name: name(for: $0), color: nil) }
+            
+            filters.append(Section(category: .level, items: items))
+        }
+        
         if let venuesSection = scheduleFilter.allFilters[.venue] {
             
             // fetch from CoreData because it caches fetch request results and is more efficient
diff --git a/OpenStack Summit/OpenStack Summit/Info.plist b/OpenStack Summit/OpenStack Summit/Info.plist
index 875b540a..460c5d93 100644
--- a/OpenStack Summit/OpenStack Summit/Info.plist	
+++ b/OpenStack Summit/OpenStack Summit/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/OpenStack Summit/OpenStack Summit/Member.storyboard b/OpenStack Summit/OpenStack Summit/Member.storyboard
index 1abb93c2..2a4eb0d7 100644
--- a/OpenStack Summit/OpenStack Summit/Member.storyboard	
+++ b/OpenStack Summit/OpenStack Summit/Member.storyboard	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -529,7 +529,7 @@
                                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <pickerView hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4OJ-r4-aGt">
+                                        <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4OJ-r4-aGt">
                                             <rect key="frame" x="0.0" y="96.5" width="320" height="232.5"/>
                                             <connections>
                                                 <outlet property="dataSource" destination="2AE-JK-G41" id="cIr-DD-zvL"/>
@@ -637,7 +637,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gmo-Iy-ft1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2912" y="-521"/>
+            <point key="canvasLocation" x="2957" y="-583"/>
         </scene>
     </scenes>
     <resources>
diff --git a/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift
index cd09ba18..93fc01c2 100755
--- a/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/PersonalScheduleViewController.swift	
@@ -47,12 +47,13 @@ final class PersonalScheduleViewController: ScheduleViewController, IndicatorInf
     
     override func scheduledEvents(filter: DateFilter) -> [ScheduleItem] {
         
-        guard let attendeeRole = Store.shared.authenticatedMember?.attendeeRole
+        guard let attendeeRole = Store.shared.authenticatedMember?.attendeeRole,
+            case .interval(let interval) = filter
             else { return [] }
         
         let events = attendeeRole.schedule
-            .filter({ Date(foundation: $0.start) >= Date(foundation: startDate)
-                && Date(foundation: $0.end) <= Date(foundation: endDate) })
+            .filter({ Date(foundation: $0.start) >= interval.start
+                && Date(foundation: $0.end) <= interval.end })
             .sort({ Date(foundation: $0.0.start) < Date(foundation: $0.1.start) })
         
         return ScheduleItem.from(managedObjects: events)
diff --git a/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift b/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift
index 79f16442..628efb59 100644
--- a/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift	
+++ b/OpenStack Summit/OpenStack Summit/PushNotificationManager.swift	
@@ -544,7 +544,7 @@ public struct TeamMessageNotification: PushNotification {
     
     private enum Key: String {
         
-        case from, id, type, body, from_id, from_first_name, from_last_name, created_at
+        case to, id, type, body, from_id, from_first_name, from_last_name, created_at
     }
     
     public static let type = PushNotificationType.team
@@ -561,7 +561,7 @@ public struct TeamMessageNotification: PushNotification {
     
     public init?(pushNotification: [String: String]) {
         
-        guard let topicString = pushNotification[Key.from.rawValue],
+        guard let topicString = pushNotification[Key.to.rawValue],
             let topic = Notification.Topic(rawValue: topicString),
             let typeString = pushNotification[Key.type.rawValue],
             let type = PushNotificationType(rawValue: typeString),
@@ -603,7 +603,7 @@ public struct GeneralNotification: PushNotification {
     
     private enum Key: String {
         
-        case from, id, type, body, summit_id, channel, created_at, event_id, title
+        case to, id, type, body, summit_id, channel, created_at, event_id, title
     }
     
     public static let type = PushNotificationType.notification
@@ -624,7 +624,7 @@ public struct GeneralNotification: PushNotification {
     
     public init?(pushNotification: [String: String]) {
         
-        guard let topicString = pushNotification[Key.from.rawValue],
+        guard let topicString = pushNotification[Key.to.rawValue],
             let topic = Notification.Topic(rawValue: topicString),
             let typeString = pushNotification[Key.type.rawValue],
             let type = PushNotificationType(rawValue: typeString),
diff --git a/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift b/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift
index 08c6be81..0e380c42 100644
--- a/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/ScheduleViewController.swift	
@@ -138,8 +138,11 @@ class ScheduleViewController: UIViewController, EventViewController, MessageEnab
         
         self.nowSelected = false
         
-        guard let _ = nowEventIndex()
-            else { showInfoMessage("", message: "All presentations are finished for today."); return }
+        // only show alert when now button is tapped
+        if nowEventIndex() == nil && sender != nil {
+            
+            showInfoMessage("", message: "All presentations are finished for today."); return
+        }
     }
     
     @IBAction func showEventContextMenu(sender: UIButton) {
diff --git a/OpenStack Summit/OpenStack Summit/SearchViewController.swift b/OpenStack Summit/OpenStack Summit/SearchViewController.swift
index 20529327..b5c89e73 100644
--- a/OpenStack Summit/OpenStack Summit/SearchViewController.swift	
+++ b/OpenStack Summit/OpenStack Summit/SearchViewController.swift	
@@ -514,7 +514,7 @@ extension Speaker: SearchViewControllerItem {
     
     private static func predicate(for searchTerm: String, summit: Identifier) -> NSPredicate {
         
-        return NSPredicate(format: "summits.id CONTAINS %@ AND (firstName CONTAINS[c] %@ OR firstName CONTAINS[c] %@ OR affiliations.organization.name CONTAINS[c] %@)", NSNumber(longLong: Int64(summit)), searchTerm, searchTerm, searchTerm)
+        return NSPredicate(format: "summits.id CONTAINS %@ AND (firstName CONTAINS[c] %@ OR lastName CONTAINS[c] %@ OR affiliations.organization.name CONTAINS[c] %@)", NSNumber(longLong: Int64(summit)), searchTerm, searchTerm, searchTerm)
     }
 }
 
diff --git a/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist b/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist
index 54cdbd79..85cd485f 100644
--- a/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist	
+++ b/OpenStack Summit/OpenStackSummitWatch Extension/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/OpenStack Summit/OpenStackSummitWatch/Info.plist b/OpenStack Summit/OpenStackSummitWatch/Info.plist
index 1935bfed..a77beea8 100644
--- a/OpenStack Summit/OpenStackSummitWatch/Info.plist	
+++ b/OpenStack Summit/OpenStackSummitWatch/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>