diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c4ce13..f5499d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,9 +13,11 @@ All notable changes to this project will be documented in this file.
 - gitlab: https://gitlab.com/lindeas/jilo-web/-/compare/v0.1.1...HEAD
 
 ### Added
-- Added front page widgets
+- Added collapsible front page widgets
+- Added widgets to conferences, participants and components pages
 
 ### Changed
+- MVC design - models(classes folder), views(templates folder) and controllers(pages folder)
 
 ### Fixed
 
diff --git a/TODO.md b/TODO.md
index 5dfa21d..cdd7a98 100644
--- a/TODO.md
+++ b/TODO.md
@@ -10,13 +10,13 @@
 
 - - ~~add bootstrap template~~
 
-- - clean up the code to follow model-view--controller style
+- - ~~clean up the code to follow model-view--controller style~~
 
-- - no HTML inside PHP code
+- - ~~no HTML inside PHP code~~
 
 - - put all additional functions in files in a separate folder
 
-- - reduce try/catch usage, use it only for critical errors
+- - ~~reduce try/catch usage, use it only for critical errors~~
 
 - - move all SQL code in the model classes, one query per method
 
diff --git a/public_html/pages/config.php b/public_html/pages/config.php
index f78b4d2..c562a1a 100644
--- a/public_html/pages/config.php
+++ b/public_html/pages/config.php
@@ -1,13 +1,5 @@
-<?php ?>
+<?php
 
-<div>
+include('templates/widget-config.php');
 
-<p>Jilo web configuration</p>
-
-<ul>
-<?php foreach ($config as $config_item=>$config_value) { ?>
-    <li><?php echo htmlspecialchars($config_item) . ': ' . htmlspecialchars($config_value ?? ''); ?></li>
-<?php } ?>
-</ul>
-
-</div>
+?>
diff --git a/public_html/pages/front.php b/public_html/pages/front.php
index ec061e8..ce51d65 100644
--- a/public_html/pages/front.php
+++ b/public_html/pages/front.php
@@ -80,7 +80,6 @@ if (!empty($conferences['records'])) {
 // display the widget
 include('templates/widget.php');
 
-echo "<br />";
 
 // last 10 conferences
 try {
diff --git a/public_html/pages/profile.php b/public_html/pages/profile.php
index 1481fdc..92f835f 100644
--- a/public_html/pages/profile.php
+++ b/public_html/pages/profile.php
@@ -1,11 +1,5 @@
-<?php ?>
+<?php
 
-<div>
+include('templates/widget-profile.php');
 
-<p>Profile of <?= $user ?></p>
-
-<ul>
-    <li>username: <?= $_SESSION['username'] ?></li>
-</ul>
-
-</div>
+?>
diff --git a/public_html/templates/widget-config.php b/public_html/templates/widget-config.php
new file mode 100644
index 0000000..e0c9f3b
--- /dev/null
+++ b/public_html/templates/widget-config.php
@@ -0,0 +1,12 @@
+<div>
+
+<p>Jilo web configuration</p>
+
+<ul>
+<?php foreach ($config as $config_item=>$config_value) { ?>
+    <li><?php echo htmlspecialchars($config_item) . ': ' . htmlspecialchars($config_value ?? ''); ?></li>
+<?php } ?>
+</ul>
+
+</div>
+
diff --git a/public_html/templates/widget-profile.php b/public_html/templates/widget-profile.php
new file mode 100644
index 0000000..bcbc056
--- /dev/null
+++ b/public_html/templates/widget-profile.php
@@ -0,0 +1,9 @@
+<div>
+
+<p>Profile of <?= $user ?></p>
+
+<ul>
+    <li>username: <?= $_SESSION['username'] ?></li>
+</ul>
+
+</div>