diff --git a/app/models/bike.rb b/app/models/bike.rb
index 0722e27..481df86 100644
--- a/app/models/bike.rb
+++ b/app/models/bike.rb
@@ -6,6 +6,21 @@ class Bike < ActiveRecord::Base
   validates :color, presence: true
   validates :serial_number, presence: true
 
+  def self.bike_types
+    [
+      ["BMX", "BMX"],
+      ["Cruiser", "Cruiser"],
+      ["Hybrid", "Hybrid"],
+      ["Kids", "Kids"],
+      ["Mountain", "Mountain"],
+      ["Road", "Road"],
+      ["Touring", "Touring"],
+      ["Track", "Track"],
+      ["Utility", "Utility"],
+      ["Youth", "Youth"]
+    ]
+  end
+
   def name
     self.color + " " + self.brand + ' ' + self.model + " (" + self.log_number.to_s + ")"
   end
diff --git a/app/views/bikes/_fields.html.haml b/app/views/bikes/_fields.html.haml
index cbb7d63..5288ac4 100644
--- a/app/views/bikes/_fields.html.haml
+++ b/app/views/bikes/_fields.html.haml
@@ -23,7 +23,7 @@
       .form-group
         = f.label "Type:", class: "col-sm-4 control-label"
         .col-sm-6
-          = f.select :bike_type, [["BMX", "BMX"], ["Cruiser", "Cruiser"], ["Hybrid", "Hybrid"], ["Kids", "Kids"], ["Mountain", "Mountain"], ["Road", "Road"], ["Touring", "Touring"], ["Track", "Track"], ["Utility", "Utility"], ["Youth", "Youth"]], {}, class: "selectpicker", disabled: disabled
+          = f.select :bike_type, Bike.bike_types, {}, class: "selectpicker", disabled: disabled
 
       .form-group
         = f.label "Color:", class: "col-sm-4 control-label"
diff --git a/app/views/clients/_fields.html.haml b/app/views/clients/_fields.html.haml
index 92f23b7..13f3e65 100644
--- a/app/views/clients/_fields.html.haml
+++ b/app/views/clients/_fields.html.haml
@@ -38,7 +38,7 @@
   .form-group
     = f.label "Type of Bike Requested:", class: "col-sm-2 control-label"
     .col-sm-10
-      = f.select :bike_type_requested, [["BMX", "BMX"], ["Cruiser", "Cruiser"], ["Hybrid", "Hybrid"], ["Kids", "Kids"], ["Mountain", "Mountain"], ["Road", "Road"], ["Touring", "Touring"], ["Track", "Track"], ["Utility", "Utility"], ["Youth", "Youth"]], {include_blank: "No Preference"}, class: "selectpicker", disabled: disabled
+      = f.select :bike_type_requested, Bike.bike_types, {include_blank: "No Preference"}, class: "selectpicker", disabled: disabled
 
   .form-group
     = f.label "Will Pay 25$ for Lock & Helmet:", class: "col-sm-2 control-label"
diff --git a/app/views/freecyclery/available_bikes.html.haml b/app/views/freecyclery/available_bikes.html.haml
index 8426423..b18773a 100644
--- a/app/views/freecyclery/available_bikes.html.haml
+++ b/app/views/freecyclery/available_bikes.html.haml
@@ -5,11 +5,9 @@
   %table.table.table-striped.table-bordered.table-hover
     %thead
       %tr
-        %th Brand
-        %th Model
+        %th Bike
     %tbody
       - @available_bikes.each do |bike|
         %tr
-          %td= bike.brand 
-          %td= bike.model
+          %td= bike.name
 
diff --git a/app/views/freecyclery/ready_for_pickup.html.haml b/app/views/freecyclery/ready_for_pickup.html.haml
index 979981e..4ea2d4c 100644
--- a/app/views/freecyclery/ready_for_pickup.html.haml
+++ b/app/views/freecyclery/ready_for_pickup.html.haml
@@ -5,15 +5,13 @@
   %table.table.table-striped.table-bordered.table-hover
     %thead
       %tr
-        %th Brand
-        %th Model
+        %th Bike
         %th Client
         %th
     %tbody
       - @bikes_for_pickup.each do |bike|
         %tr
-          %td= bike.brand 
-          %td= bike.model
+          %td= bike.name
           %td= bike.client.name
           %td= button_to "Mark as picked up", {controller: "bikes", action: "mark_picked_up", id: bike.id}, method: :patch, class: "btn btn-default"
 
diff --git a/notes.txt b/notes.txt
index be08917..67542b1 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,9 +1,16 @@
-print sales labels should not show freecyclery bikes
+when bike gets picked up, remove it from freecyclery bike list
+  when visiting user page check if they have a bike and add it to
+the list
 
-show log number next to bikes (color model make lognumber)
+available freecyclery bikes list should have all the infos - size,
+make, model, color, etc
 
+make sure you can mark bike completion dates
+bikes ready for pickup should also include color & log number
+clients should not be on waiting list after they get assigned a bike
 
 
+print sales labels should not show freecyclery bikes
 
 search for bike based on log #
 convert to bootstrap-less or something