diff --git a/Yep/Views/Feed/FeedView.swift b/Yep/Views/Feed/FeedView.swift
index 15ac5c40..cf3c39f3 100644
--- a/Yep/Views/Feed/FeedView.swift
+++ b/Yep/Views/Feed/FeedView.swift
@@ -148,6 +148,10 @@ class FeedView: UIView {
     @IBOutlet weak var voiceTimeLabel: UILabel!
 
     @IBOutlet weak var voiceSampleViewWidthConstraint: NSLayoutConstraint!
+
+    @IBOutlet weak var locationContainerView: UIView!
+    @IBOutlet weak var locationMapImageView: UIImageView!
+    @IBOutlet weak var locationNameLabel: UILabel!
     
     @IBOutlet weak var socialWorkBorderImageView: UIImageView!
 
diff --git a/Yep/Views/Feed/FeedView.xib b/Yep/Views/Feed/FeedView.xib
index bba94c0f..3b328b77 100644
--- a/Yep/Views/Feed/FeedView.xib
+++ b/Yep/Views/Feed/FeedView.xib
@@ -180,6 +180,48 @@
                                 <constraint firstItem="3Sr-u3-Rcc" firstAttribute="leading" secondItem="E4l-Kq-xE7" secondAttribute="leading" constant="7" id="vSo-uB-CIH"/>
                             </constraints>
                         </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="loB-Af-q0W">
+                            <rect key="frame" x="0.0" y="0.0" width="294" height="80"/>
+                            <subviews>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Rq7-c8-LJz" userLabel="Map Image View">
+                                    <rect key="frame" x="1" y="1" width="292" height="59"/>
+                                    <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </imageView>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_pin_shadow" translatesAutoresizingMaskIntoConstraints="NO" id="SS5-A0-Pm3">
+                                    <rect key="frame" x="137.5" y="18.5" width="18" height="24"/>
+                                </imageView>
+                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="social_work_border_line" translatesAutoresizingMaskIntoConstraints="NO" id="3Cw-09-5dN">
+                                    <rect key="frame" x="1" y="59" width="292" height="1"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="I7o-VH-355"/>
+                                    </constraints>
+                                </imageView>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nu6-ut-PUw" userLabel="Location Name Label">
+                                    <rect key="frame" x="10" y="60" width="274" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="20" id="6gX-nz-eWM"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <constraints>
+                                <constraint firstItem="3Cw-09-5dN" firstAttribute="bottom" secondItem="Rq7-c8-LJz" secondAttribute="bottom" id="DdM-gD-yVV"/>
+                                <constraint firstAttribute="trailing" secondItem="Rq7-c8-LJz" secondAttribute="trailing" constant="1" id="EBf-Si-r5R"/>
+                                <constraint firstAttribute="bottom" secondItem="Nu6-ut-PUw" secondAttribute="bottom" id="EFC-uG-0xS"/>
+                                <constraint firstItem="Nu6-ut-PUw" firstAttribute="top" secondItem="Rq7-c8-LJz" secondAttribute="bottom" id="IoD-Qn-Ezg"/>
+                                <constraint firstItem="3Cw-09-5dN" firstAttribute="trailing" secondItem="Rq7-c8-LJz" secondAttribute="trailing" id="Mps-kV-roa"/>
+                                <constraint firstAttribute="trailing" secondItem="Nu6-ut-PUw" secondAttribute="trailing" constant="10" id="PHt-8l-hbB"/>
+                                <constraint firstItem="3Cw-09-5dN" firstAttribute="leading" secondItem="Rq7-c8-LJz" secondAttribute="leading" id="bXK-6f-cWl"/>
+                                <constraint firstItem="Rq7-c8-LJz" firstAttribute="top" secondItem="loB-Af-q0W" secondAttribute="top" constant="1" id="eFq-WL-Ady"/>
+                                <constraint firstItem="Nu6-ut-PUw" firstAttribute="leading" secondItem="loB-Af-q0W" secondAttribute="leading" constant="10" id="hPv-rO-Jjb"/>
+                                <constraint firstItem="SS5-A0-Pm3" firstAttribute="centerX" secondItem="Rq7-c8-LJz" secondAttribute="centerX" id="lqq-hn-osN"/>
+                                <constraint firstItem="SS5-A0-Pm3" firstAttribute="centerY" secondItem="Rq7-c8-LJz" secondAttribute="centerY" id="nBx-OP-Vlj"/>
+                                <constraint firstItem="Rq7-c8-LJz" firstAttribute="leading" secondItem="loB-Af-q0W" secondAttribute="leading" constant="1" id="wGr-4n-gZt"/>
+                            </constraints>
+                        </view>
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="social_work_border" translatesAutoresizingMaskIntoConstraints="NO" id="4I1-rL-pwe">
                             <rect key="frame" x="0.0" y="0.0" width="294" height="80"/>
                         </imageView>
@@ -188,6 +230,8 @@
                     <constraints>
                         <constraint firstItem="5Md-c8-aoz" firstAttribute="trailing" secondItem="hRL-ts-we1" secondAttribute="trailing" constant="15" id="0iM-so-NGq"/>
                         <constraint firstAttribute="bottom" secondItem="5Md-c8-aoz" secondAttribute="bottom" constant="1" id="1rt-eE-fH0"/>
+                        <constraint firstAttribute="trailing" secondItem="loB-Af-q0W" secondAttribute="trailing" id="4tB-zm-8AF"/>
+                        <constraint firstItem="loB-Af-q0W" firstAttribute="leading" secondItem="PFV-2X-1gy" secondAttribute="leading" id="DyM-BQ-fUc"/>
                         <constraint firstAttribute="trailing" secondItem="4I1-rL-pwe" secondAttribute="trailing" id="Ffz-uu-zWE"/>
                         <constraint firstItem="E4l-Kq-xE7" firstAttribute="centerY" secondItem="PFV-2X-1gy" secondAttribute="centerY" id="Fhu-K7-CHG"/>
                         <constraint firstItem="5Md-c8-aoz" firstAttribute="leading" secondItem="PFV-2X-1gy" secondAttribute="leading" constant="1" id="N3W-8D-VA0"/>
@@ -198,7 +242,9 @@
                         <constraint firstItem="E4l-Kq-xE7" firstAttribute="leading" secondItem="PFV-2X-1gy" secondAttribute="leading" id="aku-81-XO9"/>
                         <constraint firstItem="hRL-ts-we1" firstAttribute="centerY" secondItem="5Md-c8-aoz" secondAttribute="centerY" id="bvR-4E-h3o"/>
                         <constraint firstAttribute="trailing" secondItem="5Md-c8-aoz" secondAttribute="trailing" constant="1" id="fjR-QK-UQ3"/>
+                        <constraint firstItem="loB-Af-q0W" firstAttribute="top" secondItem="PFV-2X-1gy" secondAttribute="top" id="fqs-kR-PUo"/>
                         <constraint firstItem="4I1-rL-pwe" firstAttribute="leading" secondItem="PFV-2X-1gy" secondAttribute="leading" id="gFu-jo-r4a"/>
+                        <constraint firstAttribute="bottom" secondItem="loB-Af-q0W" secondAttribute="bottom" id="kAU-lH-td2"/>
                         <constraint firstAttribute="height" constant="80" id="utb-hg-0Rs"/>
                     </constraints>
                 </view>
@@ -245,6 +291,9 @@
                 <outlet property="githubRepoDescriptionLabel" destination="put-dx-KAt" id="5TU-Of-nB9"/>
                 <outlet property="githubRepoImageView" destination="Bgr-wb-WD7" id="D1Z-jW-yui"/>
                 <outlet property="githubRepoNameLabel" destination="Oeu-mz-AgQ" id="1bU-ys-I2Y"/>
+                <outlet property="locationContainerView" destination="loB-Af-q0W" id="qOB-BW-qzT"/>
+                <outlet property="locationMapImageView" destination="Rq7-c8-LJz" id="ldR-Cu-K3H"/>
+                <outlet property="locationNameLabel" destination="Nu6-ut-PUw" id="EUP-Wh-f0T"/>
                 <outlet property="mediaCollectionView" destination="umP-Za-loD" id="4wa-a9-jxB"/>
                 <outlet property="mediaView" destination="r5V-GF-1ON" id="tPB-3w-zKI"/>
                 <outlet property="messageLabel" destination="tE6-sP-zEh" id="zlO-bY-zdK"/>
@@ -274,8 +323,10 @@
     </objects>
     <resources>
         <image name="bubble_body" width="42" height="40"/>
+        <image name="icon_pin_shadow" width="18" height="24"/>
         <image name="icon_play" width="30" height="30"/>
         <image name="icon_repo" width="16" height="21"/>
         <image name="social_work_border" width="11" height="11"/>
+        <image name="social_work_border_line" width="22" height="2"/>
     </resources>
 </document>