                filtered-model (filter-model model search)]
            (g/grid
             {}
-            
+            (g/row {:id "search-bar"}
+                   (g/col {:xs 18 :md 3})
+                   (g/col {:xs 18 :md 6}
+                          (om/build search-input app)))
+
             (g/row
-              {:id "cheat-sheet-block"}
-              (g/col
+             {:id "cheat-sheet-block"}
+             (g/col
+              {:xs 18 :md 3}
+              (r/well
+               {}
+               (n/nav
+                {:collapsible? true :stacked? true :bs-style "pills"}
+                (dom/h4 #js {:className "section-set"} "Sections")
+                (cons (n/nav-item {:key "all" :href "#/all" :on-click #(swap! app-state assoc :view (keys model) :search "")} "All")
+                      (keep (fn [k]
+                              (build-nav-item filtered-model k (get model-names k))) 
+                            model-order)))))
+
+             (g/col
+              {:xs 18 :md 6}
+              (if view 
+                (om/build feature-view {:model filtered-model :sections view})
+                (dom/div
+                 #js {:id "logo-container"}
+                 (dom/img #js {:src "https://raw.githubusercontent.com/onyx-platform/onyx/3bf02e6fafe41315e0302f0f525992eb76eca04e/resources/logo/high-res.png" :className "full-logo"})
+                 (dom/h3 #js {:className "feature-choose"} "<< Choose a feature"))))
+
+             (if (and (= 1 (count view))
+                      (:search app))
+               (g/col
                 {:xs 18 :md 3}
-                (r/well
-                  {}
-                  (n/nav
-                    {:collapsible? true :stacked? true :bs-style "pills"}
-                    (dom/h4 #js {:className "section-set"} "Sections")
-                    (cons (n/nav-item {:key "all" :href "#/all" :on-click #(swap! app-state assoc :view (keys model))} "All")
-                          (keep (fn [[k name]]
-                                  (build-nav-item filtered-model k name)) 
-                                model-names)))))
-
-              (g/col
-                {:xs 18 :md 6}
-                (if view 
-                  (om/build feature-view {:model filtered-model :sections view})
-                  (dom/div
-                    #js {:id "logo-container"}
-                    (dom/img #js {:src "https://raw.githubusercontent.com/onyx-platform/onyx/3bf02e6fafe41315e0302f0f525992eb76eca04e/resources/logo/high-res.png" :className "full-logo"})
-                    (dom/h3 #js {:className "feature-choose"} "<< Choose a feature"))))
-              (g/col {:id "search-bar"}
-                     (g/col {:xs 18 :md 3}
-                            (om/build search-input app)))
-              (if (= 1 (count view)) 
-                (g/col
-                  {:xs 18 :md 3}
-                  (om/build feature-options {:model model :section (first view)})))))))))
+                (om/build feature-options {:model model :section (first view)})))))))))
    app-state
    {:target (. js/document (getElementById "app"))}))

	    [goog.history.EventType :as EventType])
(:import goog.History))

(def model-names {:catalog-entry "Catalogs"
                  :flow-conditions-entry "Flow Conditions"
                  :lifecycle-entry "Lifecycles"
                  :lifecycle-calls "Lifecycle Calls"

                     (into [(if-not (empty? (get-in model [section :model])) 
                              (p/panel 
                                {:id "summary" :bs-style "primary" :class "summary-doc" :header (dom/h3 nil (str (model-names section) " Summary"))}
                                (get-in model [section :summary])
                                (dom/p {})
                                (when-let [doc-url (get-in model [section :summary])] 
                                  (dom/a #js {:href doc-url} "Documentation"))))] 
                           (for [k (model-display-order section)]
                             (dom/div (if (get-in model [section :model k]) #js {} #js {:style #js {:display "none"}})
                                      (om/build display-feature {:section section :key k}))))))))
