From 4833268beccf11ad3813fc22455696578bed01ee Mon Sep 17 00:00:00 2001
From: Maurice Breit <maurice@mathandoro.com>
Date: Thu, 11 May 2017 02:18:16 +0200
Subject: [PATCH] profile, save selection

---
 CoachPlus.xcodeproj/project.pbxproj           |  26 ++++
 CoachPlus/CoachPlusInfoDev.plist              |   2 +-
 .../events/CreateEventViewController.swift    |   2 +-
 CoachPlus/app/events/EventDetail.storyboard   |  24 ++--
 .../events/EventDetailViewController.swift    |   1 +
 .../app/memberships/Memberships.storyboard    |  40 +++---
 .../memberships/MembershipsController.swift   |  10 +-
 .../cells/MembershipTableViewCell.swift       |   4 +-
 .../app/shared/events/EventTableViewCell.xib  |   4 +-
 .../shared/members/MemberTableViewCell.swift  |   4 +-
 .../ParticipationTableViewCell.swift          |   2 +-
 CoachPlus/app/team/JoinTeam.storyboard        |   2 +-
 CoachPlus/app/team/Team.storyboard            |   3 +
 CoachPlus/app/team/TeamViewController.swift   |  72 ++++++++---
 CoachPlus/app/user/User.storyboard            | 116 ++++++++++++++++++
 CoachPlus/app/user/UserViewController.swift   | 106 ++++++++++++++++
 CoachPlus/helperclasses/FlowManager.swift     |  19 ++-
 .../helperclasses/MembershipManager.swift     |  36 ++++++
 .../helperclasses/UIImageViewExtension.swift  |  47 +++++++
 CoachPlus/login/LoginViewController.swift     |   2 +-
 CoachPlus/models/Team.swift                   |   6 +-
 CoachPlus/models/User.swift                   |  15 +--
 .../register/MailSentViewController.swift     |   2 +-
 CoachPlus/ui/CoachPlusViewController.swift    |  29 ++++-
 CoachPlus/ui/NavigationBar.swift              | 114 +++++++++++++----
 CoachPlus/ui/tableheader/TableHeaderView.xib  |   9 +-
 .../ui/teamselection/TeamSelectionView.swift  |   9 +-
 .../ui/teamselection/TeamSelectionView.xib    |   6 +-
 28 files changed, 584 insertions(+), 128 deletions(-)
 create mode 100644 CoachPlus/app/user/User.storyboard
 create mode 100644 CoachPlus/app/user/UserViewController.swift
 create mode 100644 CoachPlus/helperclasses/UIImageViewExtension.swift

diff --git a/CoachPlus.xcodeproj/project.pbxproj b/CoachPlus.xcodeproj/project.pbxproj
index 694919f..47b7c18 100644
--- a/CoachPlus.xcodeproj/project.pbxproj
+++ b/CoachPlus.xcodeproj/project.pbxproj
@@ -50,6 +50,12 @@
 		473A5F891E8A9224002FD833 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473A5F871E8A9224002FD833 /* User.swift */; };
 		473A5F8B1E8A92D1002FD833 /* Membership.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473A5F8A1E8A92D1002FD833 /* Membership.swift */; };
 		473A5F8C1E8A92D1002FD833 /* Membership.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473A5F8A1E8A92D1002FD833 /* Membership.swift */; };
+		473DCE1B1EC3A6A000A42F51 /* User.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 473DCE1A1EC3A6A000A42F51 /* User.storyboard */; };
+		473DCE1C1EC3A6A000A42F51 /* User.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 473DCE1A1EC3A6A000A42F51 /* User.storyboard */; };
+		473DCE1E1EC3B9BB00A42F51 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */; };
+		473DCE1F1EC3B9BB00A42F51 /* UserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */; };
+		473DCE211EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */; };
+		473DCE221EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */; };
 		474144D11E8428A9009788E2 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 474144D01E8428A9009788E2 /* Login.storyboard */; };
 		474144D61E8429AD009788E2 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474144D51E8429AD009788E2 /* LoginViewController.swift */; };
 		474144D81E842D30009788E2 /* CoachPlus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474144D71E842D30009788E2 /* CoachPlus.swift */; };
@@ -206,6 +212,9 @@
 		473A5F7E1E8A749A002FD833 /* CoachPlus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CoachPlus.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		473A5F871E8A9224002FD833 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = models/User.swift; sourceTree = "<group>"; };
 		473A5F8A1E8A92D1002FD833 /* Membership.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Membership.swift; path = models/Membership.swift; sourceTree = "<group>"; };
+		473DCE1A1EC3A6A000A42F51 /* User.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = User.storyboard; path = app/user/User.storyboard; sourceTree = "<group>"; };
+		473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserViewController.swift; path = app/user/UserViewController.swift; sourceTree = "<group>"; };
+		473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIImageViewExtension.swift; path = helperclasses/UIImageViewExtension.swift; sourceTree = "<group>"; };
 		474144D01E8428A9009788E2 /* Login.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
 		474144D51E8429AD009788E2 /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LoginViewController.swift; path = login/LoginViewController.swift; sourceTree = "<group>"; };
 		474144D71E842D30009788E2 /* CoachPlus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoachPlus.swift; sourceTree = "<group>"; };
@@ -353,6 +362,15 @@
 			name = models;
 			sourceTree = "<group>";
 		};
+		473DCE191EC3A68700A42F51 /* user */ = {
+			isa = PBXGroup;
+			children = (
+				473DCE1A1EC3A6A000A42F51 /* User.storyboard */,
+				473DCE1D1EC3B9BB00A42F51 /* UserViewController.swift */,
+			);
+			name = user;
+			sourceTree = "<group>";
+		};
 		474144CF1E84289F009788E2 /* login */ = {
 			isa = PBXGroup;
 			children = (
@@ -458,6 +476,7 @@
 				61CA9C851EA404C4004AFAC7 /* UIViewControllerExtension.swift */,
 				61CA9C881EA406A7004AFAC7 /* CoachPlusNavigationViewController.swift */,
 				61D5F55E1EC0D4F600974EBD /* UIApplicationExtension.swift */,
+				473DCE201EC3BFE500A42F51 /* UIImageViewExtension.swift */,
 			);
 			name = helperclasses;
 			sourceTree = "<group>";
@@ -484,6 +503,7 @@
 		47A9B9141E8561D000DC8247 /* app */ = {
 			isa = PBXGroup;
 			children = (
+				473DCE191EC3A68700A42F51 /* user */,
 				61CA9C7E1EA227B7004AFAC7 /* events */,
 				616616EF1E9F9DE900E8D8D5 /* shared */,
 				47F041F51E8E5C850020D78E /* team */,
@@ -840,6 +860,7 @@
 				61CA9C9D1EA52211004AFAC7 /* TitleView.xib in Resources */,
 				61CA9C961EA51EA2004AFAC7 /* EventDetail.storyboard in Resources */,
 				473A5F731E8A749A002FD833 /* Login.storyboard in Resources */,
+				473DCE1B1EC3A6A000A42F51 /* User.storyboard in Resources */,
 				473A5F741E8A749A002FD833 /* Verification.storyboard in Resources */,
 				47F041EC1E8E59540020D78E /* MembershipTableViewCell.xib in Resources */,
 				61ACB7201EA0D6D600A7A1D2 /* MemberTableViewCell.xib in Resources */,
@@ -871,6 +892,7 @@
 				61CA9C9E1EA52211004AFAC7 /* TitleView.xib in Resources */,
 				473483251EC20A2000F60110 /* Assets.xcassets in Resources */,
 				61CA9C971EA51EA2004AFAC7 /* EventDetail.storyboard in Resources */,
+				473DCE1C1EC3A6A000A42F51 /* User.storyboard in Resources */,
 				474144D11E8428A9009788E2 /* Login.storyboard in Resources */,
 				478DE2321E8537A600DCF74A /* Verification.storyboard in Resources */,
 				47F041ED1E8E59540020D78E /* MembershipTableViewCell.xib in Resources */,
@@ -1128,6 +1150,7 @@
 				473A5F641E8A749A002FD833 /* ViewController.swift in Sources */,
 				61CA9C8C1EA407E8004AFAC7 /* CoachPlusViewController.swift in Sources */,
 				473A5F651E8A749A002FD833 /* Authentication.swift in Sources */,
+				473DCE211EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */,
 				473A5F661E8A749A002FD833 /* MailSentViewController.swift in Sources */,
 				61CA9CB11EA535D7004AFAC7 /* EventDetailViewController.swift in Sources */,
 				473A5F671E8A749A002FD833 /* ApiResponse.swift in Sources */,
@@ -1145,6 +1168,7 @@
 				473A5F6C1E8A749A002FD833 /* AppDelegate.swift in Sources */,
 				477A27591E8C3775005516ED /* InviteResponse.swift in Sources */,
 				61CA9CA41EA52575004AFAC7 /* ParticipationView.swift in Sources */,
+				473DCE1E1EC3B9BB00A42F51 /* UserViewController.swift in Sources */,
 				61D5F55C1EC0C58100974EBD /* HomeDrawerController.swift in Sources */,
 				473A5F6D1E8A749A002FD833 /* FlowManager.swift in Sources */,
 				473A5F8B1E8A92D1002FD833 /* Membership.swift in Sources */,
@@ -1187,6 +1211,7 @@
 				4749C5021E81B7FE0068B0FA /* ViewController.swift in Sources */,
 				61CA9C8D1EA407E8004AFAC7 /* CoachPlusViewController.swift in Sources */,
 				47B1B6221E87265500F80101 /* Authentication.swift in Sources */,
+				473DCE221EC3BFE500A42F51 /* UIImageViewExtension.swift in Sources */,
 				472B9C0C1E86C35A00706E6B /* MailSentViewController.swift in Sources */,
 				61CA9CB21EA535D7004AFAC7 /* EventDetailViewController.swift in Sources */,
 				47B1B62E1E8815F500F80101 /* ApiResponse.swift in Sources */,
@@ -1204,6 +1229,7 @@
 				4749C5001E81B7FE0068B0FA /* AppDelegate.swift in Sources */,
 				477A275A1E8C40A3005516ED /* InviteResponse.swift in Sources */,
 				61CA9CA51EA52575004AFAC7 /* ParticipationView.swift in Sources */,
+				473DCE1F1EC3B9BB00A42F51 /* UserViewController.swift in Sources */,
 				61D5F55D1EC0C58100974EBD /* HomeDrawerController.swift in Sources */,
 				47B1B6261E87C81B00F80101 /* FlowManager.swift in Sources */,
 				473A5F8C1E8A92D1002FD833 /* Membership.swift in Sources */,
diff --git a/CoachPlus/CoachPlusInfoDev.plist b/CoachPlus/CoachPlusInfoDev.plist
index cd0cdfa..c335df0 100644
--- a/CoachPlus/CoachPlusInfoDev.plist
+++ b/CoachPlus/CoachPlusInfoDev.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.1</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
diff --git a/CoachPlus/app/events/CreateEventViewController.swift b/CoachPlus/app/events/CreateEventViewController.swift
index 049b0b7..054a7a8 100644
--- a/CoachPlus/app/events/CreateEventViewController.swift
+++ b/CoachPlus/app/events/CreateEventViewController.swift
@@ -41,7 +41,7 @@ class CreateEventViewController: CoachPlusViewController {
             "end": end.toString()
         ]
         
-        DataHandler.def.createEvent(team: self.team!, createEvent: createEvent, successHandler: { response in
+        DataHandler.def.createEvent(team: (self.membership?.team!)!, createEvent: createEvent, successHandler: { response in
             self.navigationController?.popViewController(animated: true)
         }, failHandler: { error in
             print(error)
diff --git a/CoachPlus/app/events/EventDetail.storyboard b/CoachPlus/app/events/EventDetail.storyboard
index b3c2227..a62dbac 100644
--- a/CoachPlus/app/events/EventDetail.storyboard
+++ b/CoachPlus/app/events/EventDetail.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="xIY-BV-OUp">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="xIY-BV-OUp">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,11 +19,11 @@
                         <viewControllerLayoutGuide type="bottom" id="W8f-os-z9n"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ysw-Qv-GBj">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OXG-OV-c6E">
-                                <rect key="frame" x="41" y="20" width="278" height="18"/>
+                                <rect key="frame" x="41" y="40" width="278" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="bmo-dp-RJL"/>
                                 </constraints>
@@ -32,7 +32,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qnJ-Jg-j2x">
-                                <rect key="frame" x="327" y="22" width="20" height="20"/>
+                                <rect key="frame" x="327" y="42" width="20" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="Hvc-oy-f8l"/>
                                     <constraint firstAttribute="width" constant="20" id="auR-78-Ohh"/>
@@ -40,7 +40,7 @@
                                 <state key="normal" title="E"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bo2-0I-Le4">
-                                <rect key="frame" x="41" y="43" width="310" height="15"/>
+                                <rect key="frame" x="41" y="63" width="310" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="mLV-Cu-zgY"/>
                                 </constraints>
@@ -49,7 +49,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xet-c3-g2b">
-                                <rect key="frame" x="41" y="63" width="310" height="15"/>
+                                <rect key="frame" x="41" y="83" width="310" height="15"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="15" id="axs-4b-IYT"/>
                                 </constraints>
@@ -58,7 +58,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="Px1-Ag-0qB">
-                                <rect key="frame" x="41" y="98" width="293" height="60"/>
+                                <rect key="frame" x="41" y="118" width="293" height="60"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="S4h-Uj-JN2"/>
                                 </constraints>
@@ -67,7 +67,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rlW-i4-csX" customClass="TitleView" customModule="CoachPlus" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="178" width="375" height="45"/>
+                                <rect key="frame" x="0.0" y="198" width="375" height="45"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="45" id="XjG-wW-PcX"/>
@@ -77,7 +77,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="5YT-0M-Fny">
-                                <rect key="frame" x="0.0" y="223" width="375" height="380"/>
+                                <rect key="frame" x="0.0" y="243" width="375" height="424"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="xIY-BV-OUp" id="WMg-OC-tZA"/>
@@ -109,8 +109,10 @@
                             <constraint firstItem="rlW-i4-csX" firstAttribute="leading" secondItem="Ysw-Qv-GBj" secondAttribute="leading" id="uyh-YU-UKb"/>
                             <constraint firstItem="rlW-i4-csX" firstAttribute="top" secondItem="Px1-Ag-0qB" secondAttribute="bottom" constant="20" id="vDz-D0-QhK"/>
                         </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="string" keyPath="heroID" value="eventTableViewCell"/>
+                        </userDefinedRuntimeAttributes>
                     </view>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/>
                     <connections>
                         <outlet property="dateTimeLbl" destination="bo2-0I-Le4" id="6nX-mE-8cF"/>
                         <outlet property="descriptionLbl" destination="Px1-Ag-0qB" id="WiW-Zd-Tcv"/>
diff --git a/CoachPlus/app/events/EventDetailViewController.swift b/CoachPlus/app/events/EventDetailViewController.swift
index 3457e03..c0cab50 100644
--- a/CoachPlus/app/events/EventDetailViewController.swift
+++ b/CoachPlus/app/events/EventDetailViewController.swift
@@ -24,6 +24,7 @@ class EventDetailViewController: CoachPlusViewController, UITableViewDelegate, U
         self.tableView.register(nib: "ParticipationTableViewCell", reuseIdentifier: "ParticipationTableViewCell")
         self.tableView.rowHeight = UITableViewAutomaticDimension
         self.tableView.estimatedRowHeight = 70
+        super.viewDidLoad()
     }
     
     override func viewWillAppear(_ animated: Bool) {
diff --git a/CoachPlus/app/memberships/Memberships.storyboard b/CoachPlus/app/memberships/Memberships.storyboard
index 017ba9f..e4e3447 100644
--- a/CoachPlus/app/memberships/Memberships.storyboard
+++ b/CoachPlus/app/memberships/Memberships.storyboard
@@ -14,7 +14,7 @@
             <objects>
                 <navigationController navigationBarHidden="YES" id="yVP-6x-AdH" sceneMemberID="viewController">
                     <nil key="simulatedTopBarMetrics"/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="I8s-Ns-sdr">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="I8s-Ns-sdr">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -39,21 +39,26 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gxd-e7-pTn">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LogoWhite" translatesAutoresizingMaskIntoConstraints="NO" id="s27-1p-m15">
+                                        <rect key="frame" x="8" y="20" width="359" height="24"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="24" id="c20-du-jQa"/>
+                                        </constraints>
+                                    </imageView>
+                                </subviews>
                                 <color key="backgroundColor" red="0.20000000000000001" green="0.50588235294117645" blue="0.72156862745098038" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="45" id="eQw-fR-ysv"/>
+                                    <constraint firstItem="s27-1p-m15" firstAttribute="centerY" secondItem="Gxd-e7-pTn" secondAttribute="centerY" id="Sv4-WE-nTz"/>
+                                    <constraint firstAttribute="height" constant="64" id="eQw-fR-ysv"/>
+                                    <constraint firstAttribute="trailing" secondItem="s27-1p-m15" secondAttribute="trailing" constant="8" id="rwA-bb-jxQ"/>
+                                    <constraint firstItem="s27-1p-m15" firstAttribute="leading" secondItem="Gxd-e7-pTn" secondAttribute="leading" constant="8" id="wRj-2u-ggZ"/>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hWS-A5-wKw">
-                                <rect key="frame" x="0.0" y="45" width="375" height="45"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="45"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YOUR TEAMS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bjT-cf-C9t">
-                                        <rect key="frame" x="8" y="8" width="359" height="29"/>
-                                        <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
-                                        <color key="textColor" red="0.60784313725490191" green="0.60784313725490191" blue="0.60784313725490191" alpha="1" colorSpace="calibratedRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="owJ-jH-6dR">
                                         <rect key="frame" x="12" y="8" width="53" height="29"/>
                                         <constraints>
@@ -69,7 +74,11 @@
                                         <constraints>
                                             <constraint firstAttribute="width" constant="30" id="TbX-eo-4PO"/>
                                         </constraints>
-                                        <state key="normal" title="+"/>
+                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="25"/>
+                                        <inset key="titleEdgeInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="4"/>
+                                        <state key="normal" title="+">
+                                            <color key="titleColor" red="0.19376453760000001" green="0.50850099329999998" blue="0.85232251879999998" alpha="1" colorSpace="calibratedRGB"/>
+                                        </state>
                                         <connections>
                                             <segue destination="X5w-Q2-Qm2" kind="show" id="6fV-2Z-C3Z"/>
                                         </connections>
@@ -77,14 +86,10 @@
                                 </subviews>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="bjT-cf-C9t" secondAttribute="trailing" constant="8" id="1Sm-NW-he6"/>
                                     <constraint firstAttribute="height" constant="45" id="6Le-Ap-dN1"/>
                                     <constraint firstItem="Os0-UE-yOd" firstAttribute="top" secondItem="hWS-A5-wKw" secondAttribute="top" constant="8" id="7CW-ZN-loA"/>
                                     <constraint firstAttribute="bottom" secondItem="owJ-jH-6dR" secondAttribute="bottom" constant="8" id="MhB-7q-re6"/>
                                     <constraint firstAttribute="trailing" secondItem="Os0-UE-yOd" secondAttribute="trailing" constant="8" id="QKx-Hl-Ldc"/>
-                                    <constraint firstAttribute="bottom" secondItem="bjT-cf-C9t" secondAttribute="bottom" constant="8" id="XAr-et-ObK"/>
-                                    <constraint firstItem="bjT-cf-C9t" firstAttribute="leading" secondItem="hWS-A5-wKw" secondAttribute="leading" constant="8" id="bM1-3T-KgY"/>
-                                    <constraint firstItem="bjT-cf-C9t" firstAttribute="top" secondItem="hWS-A5-wKw" secondAttribute="top" constant="8" id="emf-qO-Npq"/>
                                     <constraint firstItem="owJ-jH-6dR" firstAttribute="leading" secondItem="hWS-A5-wKw" secondAttribute="leading" constant="12" id="ovz-vg-YcL"/>
                                     <constraint firstItem="owJ-jH-6dR" firstAttribute="top" secondItem="hWS-A5-wKw" secondAttribute="top" constant="8" id="wTq-Cy-FTC"/>
                                     <constraint firstAttribute="bottom" secondItem="Os0-UE-yOd" secondAttribute="bottom" constant="7" id="wYb-rC-f3a"/>
@@ -111,7 +116,7 @@
                                 </constraints>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QgF-Z4-emy">
-                                <rect key="frame" x="0.0" y="90" width="375" height="532"/>
+                                <rect key="frame" x="0.0" y="109" width="375" height="513"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="mQM-k1-2aN" id="xZ1-tx-oGF"/>
@@ -163,4 +168,7 @@
             <point key="canvasLocation" x="1366" y="259"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="LogoWhite" width="275" height="58"/>
+    </resources>
 </document>
diff --git a/CoachPlus/app/memberships/MembershipsController.swift b/CoachPlus/app/memberships/MembershipsController.swift
index 768ca69..c67122a 100644
--- a/CoachPlus/app/memberships/MembershipsController.swift
+++ b/CoachPlus/app/memberships/MembershipsController.swift
@@ -23,10 +23,8 @@ class MembershipsController: UIViewController, UITableViewDelegate, UITableViewD
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 70
 
-    }
-    
-    override func viewDidAppear(_ animated: Bool) {
         self.loadTeams()
+        
     }
     
     @IBAction func refreshBtnTapped(_ sender: Any) {
@@ -81,7 +79,9 @@ class MembershipsController: UIViewController, UITableViewDelegate, UITableViewD
         let membership = self.memberships[indexPath.row]
         let team = membership.team
         
-        if (MembershipManager.shared.selectedMembership?.team?.id != team?.id) {
+        let selectedMembership = MembershipManager.shared.selectedMembership
+        
+        if (selectedMembership?.team?.id != team?.id) {
             
             MembershipManager.shared.selectedMembership = membership
             let teamStoryboard = UIStoryboard(name: "Team", bundle: nil)
@@ -89,7 +89,7 @@ class MembershipsController: UIViewController, UITableViewDelegate, UITableViewD
             let navController = teamStoryboard.instantiateInitialViewController() as! CoachPlusNavigationViewController
             let teamController = navController.viewControllers[0] as! TeamViewController
             
-            teamController.team = team
+            teamController.membership = membership
             
             self.slideMenuController()?.changeMainViewController(navController, close: true)
         } else {
diff --git a/CoachPlus/app/memberships/cells/MembershipTableViewCell.swift b/CoachPlus/app/memberships/cells/MembershipTableViewCell.swift
index 73e3d62..0828724 100644
--- a/CoachPlus/app/memberships/cells/MembershipTableViewCell.swift
+++ b/CoachPlus/app/memberships/cells/MembershipTableViewCell.swift
@@ -37,9 +37,7 @@ class MembershipTableViewCell: UITableViewCell {
             self.editBtn.setTitle("", for: UIControlState.normal)
         }
         
-        let url = URL(string: "https://s-media-cache-ak0.pinimg.com/originals/b5/79/5c/b5795ce445a43dd8c749b7cea29fb8de.jpg")!
-        
-        self.imageV.af_setImage(withURL: url)
+        self.imageV.setTeamImage(team: membership.team!, placeholderColor: nil)
     }
     
 }
diff --git a/CoachPlus/app/shared/events/EventTableViewCell.xib b/CoachPlus/app/shared/events/EventTableViewCell.xib
index 57b8e80..f3a2734 100644
--- a/CoachPlus/app/shared/events/EventTableViewCell.xib
+++ b/CoachPlus/app/shared/events/EventTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
diff --git a/CoachPlus/app/shared/members/MemberTableViewCell.swift b/CoachPlus/app/shared/members/MemberTableViewCell.swift
index c939f3e..0bb2bec 100644
--- a/CoachPlus/app/shared/members/MemberTableViewCell.swift
+++ b/CoachPlus/app/shared/members/MemberTableViewCell.swift
@@ -17,9 +17,7 @@ class MemberTableViewCell: UITableViewCell {
     
     func setup(membership: Membership) {
         textLbl.text = membership.user?.fullname
-        
-        membership.user?.setImage(imageV: self.imageV)
-        
+        self.imageV.setUserImage(user: membership.user!)
     }
     
 }
diff --git a/CoachPlus/app/shared/participation/ParticipationTableViewCell.swift b/CoachPlus/app/shared/participation/ParticipationTableViewCell.swift
index 6d7993a..d12b1eb 100644
--- a/CoachPlus/app/shared/participation/ParticipationTableViewCell.swift
+++ b/CoachPlus/app/shared/participation/ParticipationTableViewCell.swift
@@ -27,7 +27,7 @@ class ParticipationTableViewCell: UITableViewCell, ParticipationViewDelegate {
         self.participationView.delegate = self
         self.participationView.mode = self.mode
         self.participationView.configure(participation: self.participation!)
-        self.participation?.user?.setImage(imageV: self.imageV)
+        self.imageV.setUserImage(user: (self.participation?.user)!)
         self.nameLbl.text = self.participation?.user?.fullname
     }
     
diff --git a/CoachPlus/app/team/JoinTeam.storyboard b/CoachPlus/app/team/JoinTeam.storyboard
index 57cd002..928e503 100644
--- a/CoachPlus/app/team/JoinTeam.storyboard
+++ b/CoachPlus/app/team/JoinTeam.storyboard
@@ -12,6 +12,7 @@
         <!--Coach Plus Navigation View Controller-->
         <scene sceneID="Am2-Xu-5K3">
             <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="eMI-mO-vt9" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <navigationController id="0gD-1j-Fd8" customClass="CoachPlusNavigationViewController" customModule="CoachPlus" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="erA-5f-yOl" customClass="CoachPlusNavigationBar" customModule="CoachPlus" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -24,7 +25,6 @@
                         <segue destination="4Nm-wz-qyH" kind="relationship" relationship="rootViewController" id="7kp-8C-PVG"/>
                     </connections>
                 </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="eMI-mO-vt9" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-786" y="127"/>
         </scene>
diff --git a/CoachPlus/app/team/Team.storyboard b/CoachPlus/app/team/Team.storyboard
index d1921bb..1e44e01 100644
--- a/CoachPlus/app/team/Team.storyboard
+++ b/CoachPlus/app/team/Team.storyboard
@@ -20,6 +20,9 @@
                             <userDefinedRuntimeAttribute type="string" keyPath="leftBarButtonTypeString" value="teamSelection"/>
                         </userDefinedRuntimeAttributes>
                     </navigationBar>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="isHeroEnabled" value="YES"/>
+                    </userDefinedRuntimeAttributes>
                     <connections>
                         <segue destination="xIr-gU-uqv" kind="relationship" relationship="rootViewController" id="gEe-Bh-88H"/>
                     </connections>
diff --git a/CoachPlus/app/team/TeamViewController.swift b/CoachPlus/app/team/TeamViewController.swift
index 5eedfa0..7c9c23b 100644
--- a/CoachPlus/app/team/TeamViewController.swift
+++ b/CoachPlus/app/team/TeamViewController.swift
@@ -8,8 +8,9 @@
 
 import UIKit
 import DZNEmptyDataSet
+import Hero
 
-class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableViewDataSource, TableHeaderViewButtonDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
+class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableViewDataSource, TableHeaderViewButtonDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate, CoachPlusNavigationBarDelegate {
 
     enum Section:Int {
         case events = 0
@@ -26,6 +27,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     
     var members = [Membership]()
     var events = [Event]()
+    var allEvents = [Event]()
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -44,19 +46,32 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
         self.tableView.emptyDataSetDelegate = self
         self.tableView.tableFooterView = UIView()
         
+        if (self.membership != nil) {
+            MembershipManager.shared.selectMembership(membership: self.membership!)
+        }
+        
+        self.setupNavbar()
+        
+        super.viewDidLoad()
+    }
+    
+    func setupNavbar() {
         let navbar = self.navigationController?.navigationBar as! CoachPlusNavigationBar
         
-        if (self.team != nil) {
-            navbar.setTeamSelection(team: self.team)
+        if (self.membership != nil && self.membership?.team != nil) {
+            navbar.setTeamSelection(team: self.membership?.team!)
         } else {
             navbar.setLeftBarButtonType(type: .teams)
         }
         
-        super.viewDidLoad()
+        navbar.setRightBarButtonType(type: .profile)
+        
+        self.setupNavBarDelegate()
+
     }
     
     override func viewDidAppear(_ animated: Bool) {
-        if (self.team != nil) {
+        if (self.membership?.team != nil) {
             self.getMembers()
             self.getEvents()
         }
@@ -67,7 +82,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     }
     
     func getMembers() {
-        _ = DataHandler.def.getMembers(teamId: (self.team?.id)!, successHandler: { memberships in
+        _ = DataHandler.def.getMembers(teamId: (self.membership?.team?.id)!, successHandler: { memberships in
             self.members = memberships
             self.tableView.reloadData()
         }, failHandler: { err in
@@ -76,17 +91,26 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     }
     
     func getEvents() {
-        _ = DataHandler.def.getEventsOfTeam(team: self.team!, successHandler: { events in
-            self.events = events
+        _ = DataHandler.def.getEventsOfTeam(team: (self.membership?.team!)!, successHandler: { events in
+            self.allEvents = events.sorted(by: {(eventA, eventB) in
+                return eventA.start < eventB.start
+            })
+            self.events = self.getNextEvents()
             self.tableView.reloadData()
         }, failHandler: { err in
             print(err)
         })
     }
     
+    func getNextEvents() -> [Event]{
+        return self.allEvents.filter({ event in
+            return event.isInPast() == false
+        })
+    }
+    
     func numberOfSections(in tableView: UITableView) -> Int {
         
-        if (self.team == nil) {
+        if (self.membership?.team == nil) {
             return 0
         }
         
@@ -95,7 +119,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        if (self.team == nil) {
+        if (self.membership?.team == nil) {
             return 0
         }
         
@@ -140,7 +164,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        if (self.team == nil) {
+        if (self.membership?.team == nil) {
             let cell = UITableViewCell(style: .default, reuseIdentifier: "abc")
             cell.textLabel?.text = "Nothing"
             return cell
@@ -193,7 +217,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        if (self.team == nil) {
+        if (self.membership?.team == nil) {
             return nil
         }
         let cell = self.tableView.dequeueReusableHeaderFooterView(withIdentifier: "TableHeader")
@@ -210,7 +234,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if (self.team == nil) {
+        if (self.membership?.team == nil) {
             return 0
         }
         return 45
@@ -219,12 +243,12 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
     func newEvent() {
         print("new Event")
         let vc = UIStoryboard(name: "CreateEvent", bundle: nil).instantiateInitialViewController() as! CreateEventViewController
-        vc.team = self.team
+        vc.membership = self.membership
         self.navigationController?.pushViewController(vc, animated: true)
     }
     
     func newMember() {
-        _ = DataHandler.def.createInviteLink(team: self.team!, validDays: nil, successHandler: { link in
+        _ = DataHandler.def.createInviteLink(team: (self.membership?.team!)!, validDays: nil, successHandler: { link in
             
             let url = URL(string: link)!
             
@@ -262,7 +286,7 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
             switch self.eventRowType(indexPath) {
             case .seeAll:
                 let vc = UIStoryboard(name: "Events", bundle: nil).instantiateInitialViewController() as! EventsViewController
-                vc.events = self.events
+                vc.events = self.allEvents
                 self.navigationController?.pushViewController(vc, animated: true)
                 return
             case .empty:
@@ -279,12 +303,20 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
                 participations.append(p1)
                 event.participations = participations
                 
+                let cell = self.tableView.cellForRow(at: indexPath)
+                
                 self.pushToEventDetail(event: event)
                 return
             default:
                 return
             }
         }
+        if (indexPath.section == Section.members.rawValue) {
+            let vc = FlowManager.profileVc()
+            let user = self.members[indexPath.row].user
+            vc.user = user
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
     }
     
     
@@ -311,4 +343,12 @@ class TeamViewController: CoachPlusViewController, UITableViewDelegate, UITableV
         return attributedString
     }
     
+    func profile(sender:UIBarButtonItem) {
+        
+        let vc = FlowManager.profileVc()
+        vc.user = MembershipManager.shared.selectedMembership?.user
+        
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    
 }
diff --git a/CoachPlus/app/user/User.storyboard b/CoachPlus/app/user/User.storyboard
new file mode 100644
index 0000000..6f35cbb
--- /dev/null
+++ b/CoachPlus/app/user/User.storyboard
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="bQL-fP-AxE">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Empty Data Set Delegate-->
+        <scene sceneID="FN0-0s-EiV">
+            <objects>
+                <viewController id="bQL-fP-AxE" customClass="UserViewController" customModule="CoachPlus" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="8rA-pH-y9I"/>
+                        <viewControllerLayoutGuide type="bottom" id="lCQ-Sl-E5v"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="5Dg-QN-3ZM">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4GY-H5-zr8">
+                                <rect key="frame" x="0.0" y="64" width="375" height="211"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gFT-V4-hlU">
+                                        <rect key="frame" x="137" y="25" width="100" height="100"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" secondItem="gFT-V4-hlU" secondAttribute="height" multiplier="1:1" id="9hE-Ym-Qs2"/>
+                                            <constraint firstAttribute="width" constant="100" id="elf-Nv-7FO"/>
+                                        </constraints>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WK7-pX-2er">
+                                        <rect key="frame" x="8" y="145" width="359" height="18"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="18" id="mkx-A9-lRW"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TCa-Kb-pKW">
+                                        <rect key="frame" x="8" y="168" width="359" height="18"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="18" id="HXS-sb-Dpy"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="TCa-Kb-pKW" secondAttribute="trailing" constant="8" id="2du-3r-vbI"/>
+                                    <constraint firstItem="TCa-Kb-pKW" firstAttribute="leading" secondItem="4GY-H5-zr8" secondAttribute="leading" constant="8" id="2hL-gI-K4B"/>
+                                    <constraint firstItem="TCa-Kb-pKW" firstAttribute="top" secondItem="WK7-pX-2er" secondAttribute="bottom" constant="5" id="4Fs-IX-Jrf"/>
+                                    <constraint firstItem="gFT-V4-hlU" firstAttribute="centerX" secondItem="4GY-H5-zr8" secondAttribute="centerX" id="6Li-q3-muC"/>
+                                    <constraint firstAttribute="trailing" secondItem="WK7-pX-2er" secondAttribute="trailing" constant="8" id="DcM-pG-sJx"/>
+                                    <constraint firstAttribute="bottom" secondItem="TCa-Kb-pKW" secondAttribute="bottom" constant="25" id="FHI-jJ-ePw"/>
+                                    <constraint firstItem="WK7-pX-2er" firstAttribute="leading" secondItem="4GY-H5-zr8" secondAttribute="leading" constant="8" id="hXP-ib-iN6"/>
+                                    <constraint firstItem="WK7-pX-2er" firstAttribute="top" secondItem="gFT-V4-hlU" secondAttribute="bottom" constant="20" id="lSH-J3-oWD"/>
+                                    <constraint firstItem="gFT-V4-hlU" firstAttribute="top" secondItem="4GY-H5-zr8" secondAttribute="top" constant="25" id="riq-W4-Kpc"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4x4-8P-Upj" customClass="TitleView" customModule="CoachPlus" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="275" width="375" height="45"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="45" id="WCJ-ak-uMp"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="title" value="Du bist in folgenden Teams"/>
+                                </userDefinedRuntimeAttributes>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="rth-03-SHj">
+                                <rect key="frame" x="0.0" y="320" width="375" height="347"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <connections>
+                                    <outlet property="dataSource" destination="bQL-fP-AxE" id="nfy-NW-gIH"/>
+                                    <outlet property="delegate" destination="bQL-fP-AxE" id="lOX-zd-jtE"/>
+                                    <outlet property="emptyDataSetDelegate" destination="bQL-fP-AxE" id="twT-u8-gdh"/>
+                                    <outlet property="emptyDataSetSource" destination="bQL-fP-AxE" id="k8X-ZI-97v"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="lCQ-Sl-E5v" firstAttribute="top" secondItem="rth-03-SHj" secondAttribute="bottom" id="C1G-rg-fCX"/>
+                            <constraint firstItem="rth-03-SHj" firstAttribute="top" secondItem="4x4-8P-Upj" secondAttribute="bottom" id="JUU-Qu-hTT"/>
+                            <constraint firstAttribute="trailing" secondItem="rth-03-SHj" secondAttribute="trailing" id="NGf-Dl-J24"/>
+                            <constraint firstItem="rth-03-SHj" firstAttribute="leading" secondItem="5Dg-QN-3ZM" secondAttribute="leading" id="TXe-WV-IIs"/>
+                            <constraint firstItem="4GY-H5-zr8" firstAttribute="leading" secondItem="5Dg-QN-3ZM" secondAttribute="leading" id="YKP-Bz-BzK"/>
+                            <constraint firstAttribute="trailing" secondItem="4GY-H5-zr8" secondAttribute="trailing" id="emi-9H-Scg"/>
+                            <constraint firstAttribute="trailing" secondItem="4x4-8P-Upj" secondAttribute="trailing" id="kvv-gp-PoZ"/>
+                            <constraint firstItem="4GY-H5-zr8" firstAttribute="top" secondItem="8rA-pH-y9I" secondAttribute="bottom" id="sNN-8d-i5d"/>
+                            <constraint firstItem="4x4-8P-Upj" firstAttribute="top" secondItem="4GY-H5-zr8" secondAttribute="bottom" id="yx4-Il-PNp"/>
+                            <constraint firstItem="4x4-8P-Upj" firstAttribute="leading" secondItem="5Dg-QN-3ZM" secondAttribute="leading" id="zqe-aa-xi5"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="T23-uB-lSM"/>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
+                    <connections>
+                        <outlet property="emailL" destination="TCa-Kb-pKW" id="rSa-1r-Bhk"/>
+                        <outlet property="imageV" destination="gFT-V4-hlU" id="SE0-0O-UgB"/>
+                        <outlet property="nameL" destination="WK7-pX-2er" id="0Ya-XT-VPv"/>
+                        <outlet property="tableView" destination="rth-03-SHj" id="mpR-VU-vuQ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Qjd-74-62Q" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="72.799999999999997" y="81.409295352323838"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/CoachPlus/app/user/UserViewController.swift b/CoachPlus/app/user/UserViewController.swift
new file mode 100644
index 0000000..0bc1f74
--- /dev/null
+++ b/CoachPlus/app/user/UserViewController.swift
@@ -0,0 +1,106 @@
+//
+//  UserViewController.swift
+//  CoachPlus
+//
+//  Created by Breit, Maurice on 10.05.17.
+//  Copyright © 2017 Mathandoro GbR. All rights reserved.
+//
+
+import UIKit
+import AlamofireImage
+import DZNEmptyDataSet
+
+class UserViewController: CoachPlusViewController, UITableViewDelegate, UITableViewDataSource, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate {
+
+    var user:User?
+    var memberships = [Membership]()
+    var loaded = false
+    
+    @IBOutlet weak var imageV: UIImageView!
+    
+    @IBOutlet weak var nameL: UILabel!
+    
+    @IBOutlet weak var emailL: UILabel!
+    
+    @IBOutlet weak var tableView: UITableView!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        guard self.user != nil else {
+            if (self.isBeingPresented) {
+                self.dismiss(animated: false, completion: nil)
+            } else {
+                self.navigationController?.popViewController(animated: false)
+            }
+            return
+        }
+        self.displayUser()
+        self.setupTableView()
+        
+        self.memberships = MembershipManager.shared.getMemberships()
+    }
+    
+    func displayUser() {
+        self.nameL.text = self.user!.fullname
+        self.emailL.text = self.user!.email
+        self.imageV.setUserImage(user: self.user!)
+    }
+    
+    func setupTableView() {
+        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.estimatedRowHeight = 83
+        self.tableView.register(nib: "MembershipTableViewCell", reuseIdentifier: "MembershipCell")
+    }
+    
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.memberships.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = self.tableView.dequeueReusableCell(withIdentifier: "MembershipCell", for: indexPath) as! MembershipTableViewCell
+        let membership = self.memberships[indexPath.row]
+        cell.setup(membership: membership)
+        return cell
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
+        
+        if (self.loaded == true) {
+            let attributes = [
+                NSFontAttributeName: UIFont.fontAwesome(ofSize: 50),
+                NSForegroundColorAttributeName: UIColor.coachPlusBlue] as Dictionary!
+            
+            
+            let attributedString = NSAttributedString(string: String.fontAwesomeIcon(name: .lifeRing), attributes: attributes)
+            
+            return attributedString
+        }
+        
+        return NSAttributedString(string: "")
+        
+    }
+    
+    func description(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
+        
+        let attributes = [NSFontAttributeName: UIFont.systemFont(ofSize: 20)] as Dictionary!
+        
+        var string = ""
+        
+        if (self.loaded) {
+            string = "Why so lonely?\nCreate a team and invite your buddies!"
+        } else {
+            string = "Loading.."
+        }
+        
+        let attributedString = NSAttributedString(string: string, attributes: attributes)
+        return attributedString
+        
+    }
+    
+
+}
diff --git a/CoachPlus/helperclasses/FlowManager.swift b/CoachPlus/helperclasses/FlowManager.swift
index bc94bd9..a1f0077 100644
--- a/CoachPlus/helperclasses/FlowManager.swift
+++ b/CoachPlus/helperclasses/FlowManager.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import Hero
 
 class FlowManager {
     
@@ -22,6 +23,11 @@ class FlowManager {
         return vc
     }
     
+    static func profileVc() -> UserViewController {
+        let vc = UIStoryboard(name: "User", bundle: nil).instantiateInitialViewController() as! UserViewController
+        return vc
+    }
+    
     static func setLogin() {
         let delegate = UIApplication.shared.delegate as! AppDelegate
         let vc = loginVc()
@@ -40,16 +46,21 @@ class FlowManager {
         //window.makeKeyAndVisible()
     }
     
-    static func goToHome() {
+    static func goToHome(sourceVc:UIViewController) {
         if (Authentication.loggedIn()) {
             
             let delegate = UIApplication.shared.delegate as! AppDelegate
             
             let vc = homeVc()
-            
             let window = delegate.window!
-            window.rootViewController = vc
-            window.makeKeyAndVisible()
+            
+            UIView.transition(from: sourceVc.view, to: vc.view, duration: 0.6, options: [.transitionCrossDissolve], completion: {
+                _ in
+                window.rootViewController = vc
+                window.makeKeyAndVisible()
+            })
+            
+            
         } else {
             goToLogin()
         }
diff --git a/CoachPlus/helperclasses/MembershipManager.swift b/CoachPlus/helperclasses/MembershipManager.swift
index 409dd9e..13c7c55 100644
--- a/CoachPlus/helperclasses/MembershipManager.swift
+++ b/CoachPlus/helperclasses/MembershipManager.swift
@@ -18,6 +18,41 @@ class MembershipManager {
     
     var memberships:[Membership] = []
     
+    func selectMembership(membership:Membership) {
+        Defaults[.selectedMembershipId] = membership.id
+    }
+    
+    func getPreviouslySelectedMembership() -> Membership? {
+        let membershipId = Defaults[.selectedMembershipId]
+        guard membershipId != "" else {
+            return nil
+        }
+        
+        let memberships = self.getMemberships()
+        
+        if (memberships.count == 0) {
+            return nil
+        }
+        
+        if (memberships.count == 1) {
+            selectedMembership = memberships[0]
+            return memberships[0]
+        }
+        
+        let matchingMemberships = memberships.filter({ membership in
+            return (membership.id == membershipId)
+        })
+        
+        if (matchingMemberships.count > 0) {
+            selectedMembership = matchingMemberships[0]
+            return matchingMemberships[0]
+        }
+        
+        selectedMembership = nil
+        return nil
+        
+    }
+    
     func storeMemberships(memberships: [Membership]) {
         self.memberships = memberships
         Defaults[.membershipJSON] = memberships.toString()
@@ -33,4 +68,5 @@ class MembershipManager {
 
 extension DefaultsKeys {
     static let membershipJSON = DefaultsKey<String>("teams")
+    static let selectedMembershipId = DefaultsKey<String>("selectedMembershipId")
 }
diff --git a/CoachPlus/helperclasses/UIImageViewExtension.swift b/CoachPlus/helperclasses/UIImageViewExtension.swift
new file mode 100644
index 0000000..9ff6d53
--- /dev/null
+++ b/CoachPlus/helperclasses/UIImageViewExtension.swift
@@ -0,0 +1,47 @@
+//
+//  UIImageViewExtension.swift
+//  CoachPlus
+//
+//  Created by Breit, Maurice on 10.05.17.
+//  Copyright © 2017 Mathandoro GbR. All rights reserved.
+//
+
+import Foundation
+import UIKit
+import AlamofireImage
+
+extension UIImageView {
+    func setUserImage(user:User) {
+        let filter = AspectScaledToFillSizeWithRoundedCornersFilter(
+            size: self.frame.size,
+            radius: self.frame.size.height / 2
+        )
+        
+        let placeholder = UIImage.fontAwesomeIcon(name: .userCircleO, textColor: UIColor.coachPlusBlue, size: self.frame.size)
+        
+        if user.image != nil,
+            let url = URL(string: user.image!) {
+            self.af_setImage(withURL: url, placeholderImage: placeholder, filter: filter)
+        } else {
+            self.image = placeholder
+        }
+    }
+    
+    func setTeamImage(team:Team?, placeholderColor:UIColor?) {
+        
+        var color = UIColor.coachPlusBlue
+        
+        if (placeholderColor != nil) {
+            color = placeholderColor!
+        }
+        
+        let placeholder = UIImage.fontAwesomeIcon(name: .users, textColor: color, size: self.frame.size)
+        
+        if team != nil && team?.image != nil,
+            let url = URL(string: team!.image!) {
+            self.af_setImage(withURL: url, placeholderImage: placeholder)
+        } else {
+            self.image = placeholder
+        }
+    }
+}
diff --git a/CoachPlus/login/LoginViewController.swift b/CoachPlus/login/LoginViewController.swift
index b632c0e..b2f7064 100644
--- a/CoachPlus/login/LoginViewController.swift
+++ b/CoachPlus/login/LoginViewController.swift
@@ -48,7 +48,7 @@ class LoginViewController: UIViewController {
         _ = DataHandler.def.login(email: email, password: password, successHandler: { apiResponse in
             
             //FlowManager.presentHome(sourceVc: self)
-            FlowManager.goToHome()
+            FlowManager.goToHome(sourceVc: self)
             
             
         }, failHandler: { apiResponse in
diff --git a/CoachPlus/models/Team.swift b/CoachPlus/models/Team.swift
index 943f988..1866fdc 100644
--- a/CoachPlus/models/Team.swift
+++ b/CoachPlus/models/Team.swift
@@ -15,11 +15,13 @@ class Team:JSONable, BackJSONable {
         case name = "name"
         case id = "_id"
         case isPublic = "isPublic"
+        case image = "image"
     }
     
     var id: String
     var isPublic: Bool
     var name: String
+    var image: String?
     
     init(id:String, isPublic:Bool, name:String) {
         self.id = id
@@ -31,13 +33,15 @@ class Team:JSONable, BackJSONable {
         self.id = json[Fields.id.rawValue].stringValue
         self.isPublic = json[Fields.isPublic.rawValue].boolValue
         self.name = json[Fields.name.rawValue].stringValue
+        self.image = json[Fields.image.rawValue].string
     }
     
     func toJson() -> JSON {
         let json: JSON = [
             Fields.id.rawValue: self.id,
             Fields.isPublic.rawValue: self.isPublic,
-            Fields.name.rawValue: self.name]
+            Fields.name.rawValue: self.name,
+            Fields.image.rawValue: self.image]
         return json
     }
     
diff --git a/CoachPlus/models/User.swift b/CoachPlus/models/User.swift
index fcc9c11..52e3022 100644
--- a/CoachPlus/models/User.swift
+++ b/CoachPlus/models/User.swift
@@ -23,7 +23,7 @@ class User:JSONable, BackJSONable {
     var firstname: String
     var lastname: String
     var email: String
-    var image: String? = "https://pbs.twimg.com/profile_images/775833954314285057/FIxA8Vcq1.jpg"
+    var image: String?
     
     init(id:String, firstname:String, lastname:String, email:String) {
         self.id = id
@@ -53,18 +53,5 @@ class User:JSONable, BackJSONable {
             return "\(self.firstname) \(self.lastname)"
         }
     }
-    
-    func setImage(imageV:UIImageView) {
-        let filter = AspectScaledToFillSizeWithRoundedCornersFilter(
-            size: imageV.frame.size,
-            radius: imageV.frame.size.height / 2
-        )
-        
-        let url = URL(string: self.image!)!
-        
-        let placeholder = UIImage.fontAwesomeIcon(name: .userCircleO, textColor: UIColor.coachPlusBlue, size: imageV.frame.size)
-        
-        imageV.af_setImage(withURL: url, placeholderImage: placeholder, filter: filter)
-    }
 
 }
diff --git a/CoachPlus/register/MailSentViewController.swift b/CoachPlus/register/MailSentViewController.swift
index 0b2dc79..dbd6d1b 100644
--- a/CoachPlus/register/MailSentViewController.swift
+++ b/CoachPlus/register/MailSentViewController.swift
@@ -28,7 +28,7 @@ class MailSentViewController: UIViewController {
     }
     
     @IBAction func continueTapped(_ sender: Any) {
-        FlowManager.goToHome()
+        FlowManager.goToHome(sourceVc: self)
     }
 
 }
diff --git a/CoachPlus/ui/CoachPlusViewController.swift b/CoachPlus/ui/CoachPlusViewController.swift
index f3bfc2b..e10d5d5 100644
--- a/CoachPlus/ui/CoachPlusViewController.swift
+++ b/CoachPlus/ui/CoachPlusViewController.swift
@@ -10,25 +10,44 @@ import UIKit
 
 class CoachPlusViewController: UIViewController {
     
-    var team:Team?
+    var membership:Membership?
 
     override func viewDidLoad() {
         self.setCoachPlusLogo()
+        
+        if (self.membership == nil) {
+            self.membership = MembershipManager.shared.getPreviouslySelectedMembership()
+        }
+        
         super.viewDidLoad()
     }
     
     override func viewWillAppear(_ animated: Bool) {
-        
         super.viewWillAppear(animated)
     }
     
+    func setupNavBarDelegate() {
+        if let navbar = self.navigationController?.navigationBar as? CoachPlusNavigationBar {
+            navbar.coachPlusNavigationBarDelegate = self as? CoachPlusNavigationBarDelegate
+        }
+    }
+    
     func pushToEventDetail(event:Event) {
-        
         let targetVc = UIStoryboard(name: "EventDetail", bundle: nil).instantiateInitialViewController() as! EventDetailViewController
         targetVc.event = event
-        
         self.navigationController?.pushViewController(targetVc, animated: true)
-        
+    }
+    
+    func setLeftBarButton(type:CoachPlusNavigationBar.BarButtonType) {
+        if let navbar = self.navigationController?.navigationBar as? CoachPlusNavigationBar {
+            navbar.setLeftBarButtonType(type: type)
+        }
+    }
+    
+    func setRightBarButton(type:CoachPlusNavigationBar.BarButtonType) {
+        if let navbar = self.navigationController?.navigationBar as? CoachPlusNavigationBar {
+            navbar.setRightBarButtonType(type: type)
+        }
     }
     
 }
diff --git a/CoachPlus/ui/NavigationBar.swift b/CoachPlus/ui/NavigationBar.swift
index fac760c..7b5a3dc 100644
--- a/CoachPlus/ui/NavigationBar.swift
+++ b/CoachPlus/ui/NavigationBar.swift
@@ -9,27 +9,35 @@
 import Foundation
 import NibDesignable
 
+protocol CoachPlusNavigationBarDelegate {
+    func profile(sender:UIBarButtonItem)
+}
+
 class CoachPlusNavigationBar: UINavigationBar, NibDesignableProtocol {
     
-    enum LeftBarButtonType:String {
+    enum BarButtonType:String {
         case none = "none"
         case back = "back"
         case done = "done"
         case teams = "team"
         case selectedTeam = "selectedTeam"
+        case profile = "profile"
     }
 
     var team:Team?
     
     var teamSelectionV:TeamSelectionView?
-    private var leftBarButtonType:LeftBarButtonType = .none
+    
+    var coachPlusNavigationBarDelegate:CoachPlusNavigationBarDelegate?
+    
+    private var leftBarButtonType:BarButtonType = .none
     
     @IBInspectable var leftBarButtonTypeString: String {
         get {
             return self.leftBarButtonType.rawValue
         }
         set(type) {
-            if let typeEnum = LeftBarButtonType(rawValue: type) {
+            if let typeEnum = BarButtonType(rawValue: type) {
                 self.leftBarButtonType = typeEnum
             } else {
                 self.leftBarButtonType = .none
@@ -39,10 +47,34 @@ class CoachPlusNavigationBar: UINavigationBar, NibDesignableProtocol {
         }
     }
     
-    func setLeftBarButtonType(type:LeftBarButtonType) {
+    func setLeftBarButtonType(type:BarButtonType) {
         self.leftBarButtonTypeString = type.rawValue
     }
     
+    
+    private var rightBarButtonType:BarButtonType = .none
+    
+    @IBInspectable var rightBarButtonTypeString: String {
+        get {
+            return self.rightBarButtonType.rawValue
+        }
+        set(type) {
+            if let typeEnum = BarButtonType(rawValue: type) {
+                self.rightBarButtonType = typeEnum
+            } else {
+                self.rightBarButtonType = .none
+            }
+            
+            self.setRightBarButton()
+        }
+    }
+    
+    func setRightBarButtonType(type:BarButtonType) {
+        self.rightBarButtonTypeString = type.rawValue
+    }
+    
+    
+    
     override init (frame : CGRect) {
         super.init(frame : frame)
         self.setup()
@@ -55,45 +87,69 @@ class CoachPlusNavigationBar: UINavigationBar, NibDesignableProtocol {
     
     func setup() {
         self.setStyling()
-        self.setLeftBarButton()
+    }
+    
+    private func createBarButton(type:BarButtonType) -> UIBarButtonItem? {
+        var btn:UIBarButtonItem?
+        switch type {
+            case .back:
+                btn = self.createDoneBarButton()
+            case .done:
+                btn = self.createDoneBarButton()
+            case .selectedTeam:
+                btn = self.createTeamSelectionBarButton()
+            case .teams:
+                btn = self.createTeamsBarButton()
+            case .profile:
+                btn = self.createProfileBarButton()
+            default:
+                break
+        }
+        return btn
+    }
+    
+    private func setRightBarButton() {
+        let btn = self.createBarButton(type: self.rightBarButtonType)
+        guard btn != nil else {
+            return
+        }
+        self.topItem?.setRightBarButton(btn, animated: true)
     }
     
     private func setLeftBarButton() {
-        switch self.leftBarButtonType {
-        case .back:
-            self.setBackBarButton()
-        case .done:
-            self.setDoneBarButton()
-        case .selectedTeam:
-            self.setTeamSelectionBarButton()
-        case .teams:
-            self.setTeamsBarButton()
-        default:
-            break
+        let btn = self.createBarButton(type: self.leftBarButtonType)
+        guard btn != nil else {
+            return
         }
+        self.topItem?.setLeftBarButton(btn, animated: true)
     }
     
-    func setDoneBarButton() {
-        let doneBtn = UIBarButtonItem(title: "Done", style: .plain, target: self, action: #selector(done(sender:)))
-        self.topItem?.setLeftBarButton(doneBtn, animated: true)
+    func createDoneBarButton() -> UIBarButtonItem {
+        return UIBarButtonItem(title: "Done", style: .plain, target: self, action: #selector(done(sender:)))
     }
     
-    func setBackBarButton() {
-        let backBtn = UIBarButtonItem(title: "Back", style: .plain, target: self, action: #selector(back(sender:)))
-        self.topItem?.setLeftBarButton(backBtn, animated: true)
+    func createProfileBarButton() -> UIBarButtonItem {
+        let btn = UIBarButtonItem(title: "Profile", style: .plain, target: self, action: #selector(profile(sender:)))
+        let attributes = [NSFontAttributeName: UIFont.fontAwesome(ofSize: 20)] as [String: Any]
+        btn.setTitleTextAttributes(attributes, for: .normal)
+        btn.title = String.fontAwesomeIcon(name: .user)
+        return btn
     }
     
-    func setTeamSelectionBarButton() {
+    func createBackBarButton() -> UIBarButtonItem {
+        return UIBarButtonItem(title: "Back", style: .plain, target: self, action: #selector(back(sender:)))
+    }
+    
+    func createTeamSelectionBarButton() -> UIBarButtonItem {
         self.teamSelectionV = TeamSelectionView(frame: CGRect(x: 0, y: 0, width: 100, height: 25))
         self.teamSelectionV?.setup(team: team)
         let bbi = UIBarButtonItem(title: "text", style: .plain, target: nil, action: nil)
         bbi.customView = self.teamSelectionV
-        self.topItem?.setLeftBarButton(bbi, animated: true)
+        return bbi
     }
     
-    func setTeamsBarButton() {
-        let teamsBtn = UIBarButtonItem(title: "Teams", style: .plain, target: self, action: #selector(openSlider(sender:)))
-        self.topItem?.setLeftBarButton(teamsBtn, animated: true)
+    func createTeamsBarButton() -> UIBarButtonItem {
+        return UIBarButtonItem(title: "Teams", style: .plain, target: self, action: #selector(openSlider(sender:)))
     }
     
     func setStyling() {
@@ -121,5 +177,9 @@ class CoachPlusNavigationBar: UINavigationBar, NibDesignableProtocol {
         controller?.navigationController?.popViewController(animated: true)
     }
     
+    func profile(sender:UIBarButtonItem) {
+        self.coachPlusNavigationBarDelegate?.profile(sender: sender)
+    }
+    
     
 }
diff --git a/CoachPlus/ui/tableheader/TableHeaderView.xib b/CoachPlus/ui/tableheader/TableHeaderView.xib
index dcbf04b..5b6c090 100644
--- a/CoachPlus/ui/tableheader/TableHeaderView.xib
+++ b/CoachPlus/ui/tableheader/TableHeaderView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -30,10 +30,11 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zyC-r3-HbZ">
-                    <rect key="frame" x="329" y="7" width="30" height="30"/>
+                    <rect key="frame" x="329" y="7" width="30" height="28"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="30" id="uTO-iP-Yny"/>
                     </constraints>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="25"/>
                     <state key="normal" title="+">
                         <color key="titleColor" red="0.60784313725490191" green="0.60784313725490191" blue="0.60784313725490191" alpha="1" colorSpace="calibratedRGB"/>
                     </state>
@@ -49,7 +50,7 @@
                 <constraint firstItem="zyC-r3-HbZ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="7" id="Cby-Tc-DNb"/>
                 <constraint firstItem="VvT-fv-3dY" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="KZz-wF-4AK"/>
                 <constraint firstItem="zyC-r3-HbZ" firstAttribute="leading" secondItem="VvT-fv-3dY" secondAttribute="trailing" constant="8" id="PLY-IJ-C8X"/>
-                <constraint firstAttribute="bottom" secondItem="zyC-r3-HbZ" secondAttribute="bottom" constant="8" id="Ya6-Oc-zNI"/>
+                <constraint firstAttribute="bottom" secondItem="zyC-r3-HbZ" secondAttribute="bottom" constant="10" id="Ya6-Oc-zNI"/>
                 <constraint firstAttribute="bottom" secondItem="VvT-fv-3dY" secondAttribute="bottom" id="igr-Uy-bxi"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
diff --git a/CoachPlus/ui/teamselection/TeamSelectionView.swift b/CoachPlus/ui/teamselection/TeamSelectionView.swift
index 92e5191..6fbafad 100644
--- a/CoachPlus/ui/teamselection/TeamSelectionView.swift
+++ b/CoachPlus/ui/teamselection/TeamSelectionView.swift
@@ -73,14 +73,7 @@ class TeamSelectionView: NibDesignable {
             self.nameLbl.text = team!.name
         }
         
-        let url = URL(string: "https://s-media-cache-ak0.pinimg.com/originals/b5/79/5c/b5795ce445a43dd8c749b7cea29fb8de.jpg")!
-        
-        let filter = AspectScaledToFillSizeWithRoundedCornersFilter(
-            size: self.imageV.frame.size,
-            radius: self.imageV.frame.size.height / 2
-        )
-        
-        self.imageV.af_setImage(withURL: url, placeholderImage: nil, filter: filter)
+        self.imageV.setTeamImage(team: team, placeholderColor: UIColor.white)
         
         
         
diff --git a/CoachPlus/ui/teamselection/TeamSelectionView.xib b/CoachPlus/ui/teamselection/TeamSelectionView.xib
index 4c6a632..aa9ce89 100644
--- a/CoachPlus/ui/teamselection/TeamSelectionView.xib
+++ b/CoachPlus/ui/teamselection/TeamSelectionView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -27,7 +27,7 @@
                         <constraint firstAttribute="width" secondItem="c06-q5-ZN9" secondAttribute="height" multiplier="1:1" id="jgy-O1-NSg"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="X9u-Rq-tGH">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="clip" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="X9u-Rq-tGH">
                     <rect key="frame" x="95" y="0.0" width="280" height="90"/>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>