diff --git a/hw1/claudio_maggioni/blog.html b/hw1/claudio_maggioni/blog.html
index 8ad8e1b..a84111f 100644
--- a/hw1/claudio_maggioni/blog.html
+++ b/hw1/claudio_maggioni/blog.html
@@ -32,23 +32,23 @@
             <h4>Jul 28, 2016 -- <a class="author" href="index.html" data-me>Claudio Maggioni</a></h4>
           </section>
           <section>
-            <strong>
-              WARNING: The method showed here could not prevent the actual execution of "rm -rf"
-              if the "UNIX vandal" is clever enough. Proceed at your own risk, and make backups!
-            </strong>
-          </section>
-
-          <section>
-            <p>
-            I like Rick Astley late 80's songs, and you can see them here in my Spotify:
-            </p>
-
             <figure>
               <figcaption>My Spotify with a bunch of Rick Astley songs</figcaption>
               <img src="img/blog/spotify_rickastley.png"
                    alt="My Spotify with a bunch of Rick Astley songs">
             </figure>
 
+            <p>
+            <strong>
+              WARNING: The method showed here could not prevent the actual execution of "rm -rf"
+              if the "UNIX vandal" is clever enough. Proceed at your own risk, and make backups!
+            </strong>
+            </p>
+
+            <p>
+            I like Rick Astley late 80's songs, and you can see them here in my Spotify:
+            </p>
+
             <p>
             I like rickrolling people too, especially if they are trying to delete my entire
             <code>/home</code> directory or, even worse, <code>/</code>. Since I learned
@@ -69,7 +69,7 @@
             those files:
             </p>
 
-            <figure>
+            <figure class="right">
               <figcaption><em>Alias</em> code to use to activate <code>rmAlias</code></figcaption>
               <pre>alias rm=/bin/rmAlias
 alias sudo='sudo '
@@ -147,7 +147,7 @@ exit $?</pre>
             Let's give execution permissions to the script we have just created:
             </p>
 
-            <figure>
+            <figure class="right">
               <figcaption>Giving execution permissions of <code>rmAlias</code></figcaption>
               <pre>
 # chmod +x /bin/rmAlias</pre>
@@ -173,6 +173,11 @@ exit $?</pre>
             <h4>Jul 12, 2016 -- <a class="author" href="index.html" data-me>Claudio Maggioni</a></h4>
           </section>
           <section>
+            <figure>
+              <figcaption>The <em>X60s</em></figcaption>
+              <img src="img/blog/thinkpad1.jpg" alt="An image of the ThinkPad X60s">
+            </figure>
+
             <p>Currently, my only laptop is a
             <a href="http://www.thinkwiki.org/wiki/Category:X60s">IBM/Lenovo ThinkPad
               X60s</a>, a top line <em>ultrabook</em> from 2006 that features:
@@ -186,9 +191,8 @@ exit $?</pre>
                 I/0 ports (including a CardBus slot!).</li>
             </ul>
 
-            <figure>
-              <figcaption>The <em>X60s</em></figcaption>
-              <img src="img/blog/thinkpad1.jpg" alt="An image of the ThinkPad X60s">
+            <figure class="right">
+              <figcaption>The <em>X60s</em> one more time</figcaption>
               <img src="img/blog/thinkpad2.jpg" alt="Another image of the ThinkPad X60s">
             </figure>
 
@@ -246,7 +250,7 @@ exit $?</pre>
             <code>screenfetch</code>:
             </p>
 
-            <figure>
+            <figure class="right">
               <figcaption>The laptop running <em>screenfetch</em></figcaption>
               <img src="img/blog/screenfetch.jpg" alt="The laptop running 'screenfetch'">
             </figure>
@@ -316,7 +320,7 @@ WantedBy=multi-user.target</pre>
             Line 13 enables the Bluetooth dongle, and line 16 connects it to the keyboard we gave the mac address in <code>/etc/btkbd.conf</code>. This should work flawlessly, right? Of course it doesn't. The service starts before the <code>dbus-org.bluez.service</code> is loaded and fails. However, if the service is started manually after login the Bluetooth keyboard works. After hours of trying figuring out what was wrong I've almost asked for a return on Amazon! The last attempt I made was with sddm disabled and involved built from scratch service:
             </p>
 
-            <figure>
+            <figure class="right">
               <figcaption>My service file</figcaption>
               <pre>[Unit]
 Description=auto connect a Bluetooth keyboard
diff --git a/hw1/claudio_maggioni/css/main.css b/hw1/claudio_maggioni/css/main.css
index 4118579..03de384 100644
--- a/hw1/claudio_maggioni/css/main.css
+++ b/hw1/claudio_maggioni/css/main.css
@@ -65,12 +65,16 @@ h1, h2, h3, h4, h5, h6 {
 
 figure {
   background: rgba(0,0,0,0.05);
-  max-width: 30rem;
+  max-width: 500px;
   width: 100%;
   margin: 1rem 2rem 1rem 0;
   float: left;
 }
 
+figure.full-width {
+  max-width: 100%;
+}
+
 article section.title {
   clear: both;
 }
@@ -82,14 +86,15 @@ article section.title a.author[data-me] {
   padding: .125rem .25rem;
 }
 
-article figure:nth-child(odd) {
+figure.right {
   margin: 1rem 0rem 1rem 2rem;
   float: right;
 }
 
 @media screen and (max-width: 768px) {
-  figure {
+  figure, article figure:nth-child(odd) {
     width: 100%;
+    max-width: 100%;
     margin: 0;
     float: none;
   }
diff --git a/hw1/claudio_maggioni/index.html b/hw1/claudio_maggioni/index.html
index 48e22d9..7ab0dc9 100644
--- a/hw1/claudio_maggioni/index.html
+++ b/hw1/claudio_maggioni/index.html
@@ -56,7 +56,7 @@
         <section>
           <h2>Media</h2>
           <h3>Suggested MP3</h3>
-          <figure>
+          <figure class="full-width">
             <figcaption>Depeche Mode - Just Can't Get Enough<br>(MIDI version, from
               <a href="http://www.themostamazingwebsiteontheinternet.com/"><em>
                   The Most Amazing Website On The Internet</em></a>)</figcaption>
@@ -65,7 +65,7 @@
             </audio>
           </figure>
           <h3>Suggested Video</h3>
-          <figure>
+          <figure class="full-width">
             <figcaption>Least Used Waterloo - Geoff Marshall</figcaption>
             <iframe width="100%"
                     height="300"