1 files changed, 7 insertions, 17 deletions
diff --git a/src/main/scala/reading/component/Index.scala b/src/main/scala/reading/component/Index.scala
index 8c2fdd6..57f5b4b 100644
--- a/src/main/scala/reading/component/Index.scala
+++ b/src/main/scala/reading/component/Index.scala
@@ -9,9 +9,8 @@ import scalacss.ScalatagsCss._
 
 import reading.Books
 import reading.component.style.{ Index => IndexStyle }
-import reading.component.index.{ FiltersMenu, Filters, Books => BooksComponent }
+import reading.component.index.{ Menu, Header, Books => BooksComponent }
 import reading.models.{ Book, Filter }
-import reading.utils.RxTag
 
 object Index {
   def apply(initialFilters: Seq[Filter]): HtmlTag = {
@@ -20,25 +19,16 @@ object Index {
       if (filters().isEmpty) Books() else Book.filter(Books(), filters())
     }
     val count: Rx[Int] = Rx(books().length)
+    val showFiltersMenu: Var[Boolean] = Var(false)
 
     div(
       IndexStyle.render,
-
-      div(
-        IndexStyle.header,
-        RxTag { implicit context =>
-          span(s"Conseils de lecture, ${count()} livre${if (count() > 1) "s" else ""}")
-        }
-      ),
-
+      IndexStyle.page,
+      Menu(books, filters, showFiltersMenu),
       div(
-        IndexStyle.page,
-        FiltersMenu(books, filters),
-        div(
-          IndexStyle.main,
-          Filters(filters),
-          BooksComponent(books)
-        )
+        IndexStyle.main,
+        Header(filters, showFiltersMenu, count),
+        BooksComponent(books)
       )
     )
   }