diff --git a/docs/_templates/index.html b/docs/_templates/index.html
index 8f2ea77..2d6f8c8 100644
--- a/docs/_templates/index.html
+++ b/docs/_templates/index.html
@@ -87,8 +87,8 @@ <h2>Lentil</h2>
           <div class="col-sm-3 text-end">
             <ul>
               <li><a href="{{ pathto("dev/index") }}">Contribute</a></li>
-              <li><a href="{{ pathto("cite") }}">Citing Lentil</a></li>
-              <li><a href="{{ pathto("license") }}">License</a></li>
+              <li><a href="{{ pathto("user/extra/cite") }}">Citing Lentil</a></li>
+              <li><a href="{{ pathto("user/extra/license") }}">License</a></li>
             </ul>
           </div>
           <div class="col-sm-3 text-end">
@@ -97,7 +97,7 @@ <h2>Lentil</h2>
               <dd>
                   <a href="">docs</a>
                    |
-                  <a href="{{ pathto("release") }}">changelog</a>
+                  <a href="{{ pathto("user/extra/release") }}">changelog</a>
               </dd>
           </dl>
           <dl class="release">
diff --git a/docs/examples/_thumbnails/matlab.png b/docs/examples/_thumbnails/matlab.png
index 76ba3be..cf35a45 100644
Binary files a/docs/examples/_thumbnails/matlab.png and b/docs/examples/_thumbnails/matlab.png differ
diff --git a/docs/examples/index.rst b/docs/examples/index.rst
index b2eb360..17649d9 100644
--- a/docs/examples/index.rst
+++ b/docs/examples/index.rst
@@ -18,11 +18,7 @@ End-to-end simulations
         :link-type: doc
         :margin: 2 2 0 0
 
-<<<<<<< HEAD
         .. image:: /examples/_thumbnails/simple_diffraction.png
-=======
-        .. image:: /_static/img/psf.png
->>>>>>> 0dbad6d (Update examples structure)
             :width: 175px
             :align: center
 
@@ -31,29 +27,21 @@ End-to-end simulations
     .. grid-item-card::
         :margin: 2 2 0 0
 
-<<<<<<< HEAD
         .. image:: /examples/_thumbnails/broadband_diffraction.png
             :width: 175px
             :align: center
 
-=======
->>>>>>> 0dbad6d (Update examples structure)
         Broadband diffraction simulation
     
     .. grid-item-card::
         :margin: 2 2 0 0
 
-<<<<<<< HEAD
         .. image:: /examples/_thumbnails/segmented_diffraction.png
             :width: 175px
             :align: center
 
         Segmented aperture diffraction simulation
 
-=======
-        Segmented aperture diffraction simulation
-
->>>>>>> 0dbad6d (Update examples structure)
     .. grid-item-card::
         :margin: 2 2 0 0
 
@@ -69,6 +57,11 @@ End-to-end simulations
 
         Including a detector model
 
+    .. grid-item-card::
+        :margin: 2 2 0 0
+
+        Image simulation
+
 
 .. toctree::
     :caption: End-to-end simulations
@@ -119,11 +112,7 @@ Advanced usage
         :link-type: doc
         :margin: 2 2 0 0
 
-<<<<<<< HEAD
         .. image:: /examples/_thumbnails/matlab.png
-=======
-        .. image:: /_static/img/psf.png
->>>>>>> 0dbad6d (Update examples structure)
             :width: 175px
             :align: center
 
diff --git a/docs/user/extra/license.rst b/docs/user/extra/license.rst
index ab4a8cc..e67445e 100644
--- a/docs/user/extra/license.rst
+++ b/docs/user/extra/license.rst
@@ -4,5 +4,5 @@
 License
 *******
 
-.. include:: ../../../LICENSE.rst
-   :literal:
\ No newline at end of file
+.. literalinclude:: ../../../LICENSE.rst
+   :language: none
\ No newline at end of file