diff --git a/Site/ViewSolutions b/Site/ViewSolutions
index f4dc253..b7d04a7 160000
--- a/Site/ViewSolutions
+++ b/Site/ViewSolutions
@@ -1 +1 @@
-Subproject commit f4dc253d2fa449a42ac88f194505cebd1482575b
+Subproject commit b7d04a770c044da43567ff4087092df3ec818cb4
diff --git a/Site/src/Models/mainmodel.cpp b/Site/src/Models/mainmodel.cpp
index 73fced6..f0c6c68 100644
--- a/Site/src/Models/mainmodel.cpp
+++ b/Site/src/Models/mainmodel.cpp
@@ -3,7 +3,7 @@
 #include <quasarapp.h>
 
 MainModel::MainModel(QObject *parent) : QObject(parent) {
-    setListModel(new BaseFront::ListViewModel(this));
+    setListModel(new ViewSolutions::ListViewModel(this));
     initQuasarApp();
 }
 
@@ -47,7 +47,7 @@ QObject *MainModel::listModel() const {
 }
 
 void MainModel::setListModel(QObject *listModel) {
-    auto model = dynamic_cast<BaseFront::ListViewModel*>(listModel);
+    auto model = dynamic_cast<ViewSolutions::ListViewModel*>(listModel);
     if (!model || _listModel == model)
         return;
 
@@ -60,7 +60,7 @@ void MainModel::initQuasarApp() {
         return;
     }
 
-    _QuasarAppPage = new QList<BaseFront::InfoBlock*>();
+    _QuasarAppPage = new QList<QObject*>();
 
     auto block = new BaseFront::InfoBlock(this);
     _QuasarAppPage->push_back(block);
diff --git a/Site/src/Models/mainmodel.h b/Site/src/Models/mainmodel.h
index 02bb66d..c17b074 100644
--- a/Site/src/Models/mainmodel.h
+++ b/Site/src/Models/mainmodel.h
@@ -2,6 +2,7 @@
 #define MAINPAGE_H
 
 #include <QObject>
+#include <infoblock.h>
 #include <listviewmodel.h>
 
 enum class Languages {
@@ -31,8 +32,8 @@ signals:
 
 private:
     void initQuasarApp();
-    QList<BaseFront::InfoBlock*> * _QuasarAppPage = nullptr;
-    BaseFront::ListViewModel *_listModel = nullptr;
+    QList<QObject*> * _QuasarAppPage = nullptr;
+    ViewSolutions::ListViewModel *_listModel = nullptr;
 };
 
 #endif // MAINPAGE_H
diff --git a/Site/src/View/ListViewer.qml b/Site/src/View/ListViewer.qml
index 8500fe4..513b506 100644
--- a/Site/src/View/ListViewer.qml
+++ b/Site/src/View/ListViewer.qml
@@ -17,7 +17,7 @@ ListView {
     anchors.rightMargin: 40
     delegate: Component {
         ViewPortGradientPage {
-            property var data: block
+            property var data: modelData
             scrollPos: viewPort.globalPos
             source:  (data)? data.bakcBroundPicture: ""
             viewPortDelegatW: viewPort.width