diff --git a/app/components/app_tab_panel.rb b/app/components/app_tab_panel.rb
index 635daa7..a5ce271 100644
--- a/app/components/app_tab_panel.rb
+++ b/app/components/app_tab_panel.rb
@@ -19,11 +19,7 @@ class AppTabPanel < Netzke::Basepack::TabPanel
 
     #all users
     #  (had to use hash for borders to get the title to display properly)
-    @@app_tab_panel_items = [ :bikes_border,
-                              { layout: :fit,
-                                wrappedComponent: :brands_and_models_border,
-                                title: "Brands/Models"}
-                              ]
+    @@app_tab_panel_items = [ :bikes_border ]
 
     #for users only
     if not controller.current_user.role?(:admin)
diff --git a/app/components/bike_logs_and_tasks_accordian.rb b/app/components/bike_logs_and_tasks_accordian.rb
deleted file mode 100644
index 2a4d98c..0000000
--- a/app/components/bike_logs_and_tasks_accordian.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class BikeLogsAndTasksAccordian < Netzke::Basepack::Accordion
-  component :bike_logs
-  component :tasks
-
-  def configure(c)
-    c.prevent_header = true
-    c.items = [ :bike_logs, :tasks ]
-    super
-  end
-end
diff --git a/app/components/bike_lower_tabs.rb b/app/components/bike_lower_tabs.rb
new file mode 100644
index 0000000..d4f020d
--- /dev/null
+++ b/app/components/bike_lower_tabs.rb
@@ -0,0 +1,12 @@
+class BikeLowerTabs < Netzke::Basepack::TabPanel
+  component :bike_logs
+  component :tasks
+  component :brands_and_models_border
+
+  def configure(c)
+    c.prevent_header = true
+    c.items = [ :bike_logs, :tasks,
+                {netzke_component: :brands_and_models_border, title: "Brands and Models"} ]
+    super
+  end
+end
diff --git a/app/components/bikes_border.rb b/app/components/bikes_border.rb
index 89c1b68..b1f45bb 100644
--- a/app/components/bikes_border.rb
+++ b/app/components/bikes_border.rb
@@ -2,7 +2,7 @@ class BikesBorder < Netzke::Base
   # Remember regions collapse state and size
   include Netzke::Basepack::ItemPersistence
   component :bikes
-  component :bike_logs_and_tasks_accordian
+  component :bike_lower_tabs
 
   def configure(c)
     super
@@ -10,7 +10,7 @@ class BikesBorder < Netzke::Base
     c.title = "Bikes"
     c.items = [
      { netzke_component: :bikes, region: :center, split: true },
-     { netzke_component: :bike_logs_and_tasks_accordian, region: :south, height: 300, split: true}
+     { netzke_component: :bike_lower_tabs, region: :south, height: 300, split: true}
     ]
   end