diff --git a/app/assets/stylesheets/osem.css b/app/assets/stylesheets/osem.css
index 41bde9ff..5b578615 100644
--- a/app/assets/stylesheets/osem.css
+++ b/app/assets/stylesheets/osem.css
@@ -91,3 +91,17 @@ body {
 #submissions {
     padding-bottom: 20px;
 }
+
+#location{
+ background-repeat: no-repeat;
+ background-position: center center;
+ width: 100%;
+ min-height: 500px;
+ background-size: cover;
+ -webkit-background-size:cover;
+}
+
+#location li{
+  display: inline-block;
+  margin-right: 2em;
+}
diff --git a/app/controllers/admin/venue_controller.rb b/app/controllers/admin/venue_controller.rb
index 15156217..4c8696d6 100644
--- a/app/controllers/admin/venue_controller.rb
+++ b/app/controllers/admin/venue_controller.rb
@@ -6,13 +6,13 @@ class Admin::VenueController < ApplicationController
 
   def update
     @venue = @conference.venue
-    venue_params = params[:venue]
-    @venue.name = venue_params[:name]
-    @venue.address= venue_params[:address]
-    @venue.website = venue_params[:website]
-    @venue.description = venue_params[:description]
-    @venue.save
-    redirect_to(admin_conference_venue_info_path(:conference_id => @conference.short_title), :notice => 'Venue was successfully updated.')
+    if @venue.update_attributes!(params[:venue])
+      redirect_to(admin_conference_venue_info_path(conference_id: @conference.short_title),
+                  notice: 'Venue was successfully updated.')
+    else
+      redirect_to(admin_conference_venue_info_path(conference_id: @conference.short_title),
+                  notice: 'Venue Updation Failed!')
+    end
   end
 
   def show
diff --git a/app/models/venue.rb b/app/models/venue.rb
index e0251f7c..c63cb69b 100644
--- a/app/models/venue.rb
+++ b/app/models/venue.rb
@@ -1,7 +1,13 @@
 class Venue < ActiveRecord::Base
+  attr_accessible :name, :description, :website, :address, :photo
   has_many :conferences
   before_create :generate_guid
+  has_attached_file :photo,
+                    styles: { thumb: '100x100>', large: '300x300>' }
 
+  validates_attachment_content_type :photo,
+                                    content_type: [/jpg/, /jpeg/, /png/, /gif/],
+                                    size: { in: 0..500.kilobytes }
   private
 
   def generate_guid
diff --git a/app/views/admin/venue/venue_info.html.haml b/app/views/admin/venue/venue_info.html.haml
index af339af2..84888003 100644
--- a/app/views/admin/venue/venue_info.html.haml
+++ b/app/views/admin/venue/venue_info.html.haml
@@ -5,4 +5,7 @@
       = f.input :address, :input_html => {:rows => 1}
       = f.input :website
       = f.input :description, :input_html => { :rows => 10, :cols => 20 }
+      - unless @venue.photo.blank?
+        = image_tag @venue.photo(:thumb)
+      = f.input :photo
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}
diff --git a/app/views/conference/_location.html.haml b/app/views/conference/_location.html.haml
new file mode 100644
index 00000000..69d1e31f
--- /dev/null
+++ b/app/views/conference/_location.html.haml
@@ -0,0 +1,35 @@
+= content_for :splash_nav do
+  %li
+    %a{ href: '#location' } Location
+
+
+%div.container.text-center
+  .div.row.col-md-12
+    - unless @conference.venue.name.blank?
+      %h1
+        %strong #{ @conference.venue.name }
+    - unless @conference.venue.address.blank?
+      %h2
+        %strong #{ @conference.venue.address }
+    - unless @conference.venue.description.blank?
+      %p
+        %strong #{ @conference.venue.description }
+    %ul
+      - unless @conference.venue.address.blank?
+        %li
+          %b
+            = link_to 'View in Google Maps', "http://maps.google.com/maps?q=#{@conference.venue.address}", target: '_blank'
+      - unless @conference.venue.website.blank?
+        %li
+          %b
+            = link_to 'Visit Venue Website', @conference.venue.website, target: '_blank'
+
+
+:javascript
+  $(document).ready(function(){
+    var photo = "#{@conference.venue.photo}";
+    if(photo)
+    {
+      $('#location').css('background-image', 'url('+photo+')');
+    }
+  });
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index 2ec6879c..311da44b 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -10,7 +10,10 @@
 -unless @conference.call_for_papers.blank?
   %div#callforpapers
     = render 'call_for_papers'
+-unless @conference.venue.blank?
+  %div#location
+    = render 'location'
 %div#sponsors
   = render 'sponsor'
 %div#social-media
-  = render 'social_media'
\ No newline at end of file
+  = render 'social_media'
diff --git a/db/migrate/20140613083115_add_photo_to_venue.rb b/db/migrate/20140613083115_add_photo_to_venue.rb
new file mode 100644
index 00000000..c2d0454c
--- /dev/null
+++ b/db/migrate/20140613083115_add_photo_to_venue.rb
@@ -0,0 +1,8 @@
+class AddPhotoToVenue < ActiveRecord::Migration
+  def change
+    add_column :venues, :photo_file_name, :string
+    add_column :venues, :photo_content_type, :string
+    add_column :venues, :photo_file_size, :integer
+    add_column :venues, :photo_updated_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2d6eeb12..6d9c6744 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140612181230) do
+ActiveRecord::Schema.define(version: 20140613083115) do
 
   create_table "answers", force: true do |t|
     t.string   "title"
@@ -390,6 +390,10 @@ ActiveRecord::Schema.define(version: 20140612181230) do
     t.string   "offline_map_bounds"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "photo_file_name"
+    t.string   "photo_content_type"
+    t.integer  "photo_file_size"
+    t.datetime "photo_updated_at"
   end
 
   create_table "versions", force: true do |t|
diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb
index 8fdbe34d..47596648 100644
--- a/spec/factories/conferences.rb
+++ b/spec/factories/conferences.rb
@@ -9,5 +9,6 @@ FactoryGirl.define do
     contact_email 'admin@example.com'
     start_date Date.today
     end_date Date.tomorrow
+    venue
   end
 end
diff --git a/spec/factories/venues.rb b/spec/factories/venues.rb
index fca4e1f5..69eb863b 100644
--- a/spec/factories/venues.rb
+++ b/spec/factories/venues.rb
@@ -4,5 +4,6 @@ FactoryGirl.define do
     name 'Suse Office'
     address 'Maxfeldstrasse 5 \n90409 Nuremberg'
     website 'www.opensuse.org'
+    description 'Lorem Ipsum Dolor'
   end
 end
diff --git a/spec/views/conference/show.html.haml_spec.rb b/spec/views/conference/show.html.haml_spec.rb
index cb023e44..e2187680 100644
--- a/spec/views/conference/show.html.haml_spec.rb
+++ b/spec/views/conference/show.html.haml_spec.rb
@@ -16,6 +16,7 @@ describe 'conference/show.html.haml' do
     @sponsorship_level = @conference.sponsorship_levels.first
     @sponsorship_level.sponsors << create(:sponsor, sponsorship_level: @sponsorship_level,
                                                     conference: @conference)
+    @conference.venue = create(:venue)
     assign :conference, @conference
     render
   end
@@ -51,4 +52,12 @@ describe 'conference/show.html.haml' do
     expect(rendered).to include('http://www.google-example.com')
     expect(rendered).to include('http://youtu.be/rtyutut')
   end
+
+  it 'renders location partial' do
+    expect(view).to render_template(partial: 'conference/_location')
+    expect(rendered).to include('Suse Office')
+    expect(rendered).to include('Maxfeldstrasse 5 \n90409 Nuremberg')
+    expect(rendered).to include('www.opensuse.org')
+    expect(rendered).to include('Lorem Ipsum Dolor')
+  end
 end