diff --git a/pkg/emscripten/itch/index.html b/pkg/emscripten/itch/index.html
index d063743760..d0f9eb4aed 100644
--- a/pkg/emscripten/itch/index.html
+++ b/pkg/emscripten/itch/index.html
@@ -88,6 +88,9 @@
                       <button class="btn btn-danger disabled" id="btnAdd" onclick="document.getElementById('btnRom').click()" title="Add Games" disabled>
                          <span class="fa fa-plus" id="icnAdd"></span> </span> <span class="sr-only"></span>
                       </button>
+                      <button class="btn btn-primary enabled" id="btnClean" onclick="cleanupStorage();" title="Cleanup" disabled>
+                        <span class="fa fa-trash-o" id="btnCleanup"></span> <span class="sr-only">Cleanup</span>
+                      </button>
                       <input class="btn btn-danger disabled" style="display: none" type="file" id="btnRom" name="upload" onclick="document.getElementById('btnAdd').click();" onchange="selectFiles(event.target.files)" multiple />
                       <button class="btn btn-danger disabled" id="btnFullscreen" onclick="Module.requestFullScreen()" title="Fullscreen" disabled>
                          <span class="fa fa-desktop" id="icnAdd"></span> <span class="sr-only">Fullscreen</span>
diff --git a/pkg/emscripten/itch/itch.js b/pkg/emscripten/itch/itch.js
index 7a1a985d16..f3433fae7d 100644
--- a/pkg/emscripten/itch/itch.js
+++ b/pkg/emscripten/itch/itch.js
@@ -50,6 +50,11 @@ function reload()
    window.top.location.reload();
 }
 
+function cleanupStorage()
+{
+   localStorage.clear();
+}
+
 function dropboxInit()
 {
   document.getElementById('btnRun').disabled = true;
diff --git a/pkg/emscripten/libretro/index.html b/pkg/emscripten/libretro/index.html
index 70f5b9cb2d..21c28d1c92 100644
--- a/pkg/emscripten/libretro/index.html
+++ b/pkg/emscripten/libretro/index.html
@@ -28,75 +28,75 @@
 
            <!--Collapse content-->
            <div class="collapse navbar-toggleable-xs" id="collapseEx2">
-               <!--Navbar Brand-->
-               <a class="navbar-brand" href="#">RetroArch</a>
                <!--Links-->
                <ul class="nav navbar-nav">
                   <div class="dropdown">
-                   <li class="nav-item dropdown">
-                       <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Core Selection</button>
-                       <div class="dropdown-menu dropdown-primary" aria-labelledby="dropdownMenu1" data-dropdown-in="fadeIn" data-dropdown-out="fadeOut" id="core-selector">
-                          <a class="dropdown-item" href="." data-core="2048">2048</a>
-                          <a class="dropdown-item" href="." data-core="4do">4DO</a>
-                          <a class="dropdown-item" href="." data-core="bluemsx">BlueMSX</a>
-                          <a class="dropdown-item" href="." data-core="craft">Craft</a>
-                          <a class="dropdown-item" href="." data-core="desmume">DeSmuME</a>
-                          <a class="dropdown-item" href="." data-core="dosbox">DOSBox</a>
-                          <a class="dropdown-item" href="." data-core="easyrpg">EasyRPG</a>
-                          <a class="dropdown-item" href="." data-core="fbalpha2012">FB Alpha 2012</a>
-                          <a class="dropdown-item" href="." data-core="fbalpha2012_cps1">FB Alpha 2012 CPS1</a>
-                          <a class="dropdown-item" href="." data-core="fbalpha2012_cps2">FB Alpha 2012 CPS2</a>
-                          <a class="dropdown-item" href="." data-core="fbalpha2012_neo">FB Alpha 2012 NeoGeo</a>
-                          <a class="dropdown-item" href="." data-core="fceumm">FCEUmm</a>
-                          <a class="dropdown-item" href="." data-core="ffmpeg">FFmpeg</a>
-                          <a class="dropdown-item" href="." data-core="gambatte">Gambatte</a>
-                          <a class="dropdown-item" href="." data-core="genesis_plus_gx">Genesis Plus GX</a>
-                          <a class="dropdown-item" href="." data-core="gme">Game Music Emu</a>
-                          <a class="dropdown-item" href="." data-core="gpsp">gPSP</a>
-                          <a class="dropdown-item" href="." data-core="handy">Handy</a>
-                          <a class="dropdown-item" href="." data-core="mame2000">MAME 2000</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_lynx">Mednafen Lynx</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_ngp">Mednafen Neo Geo Pocket</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_pce_fast">Mednafen PC Engine Fast</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_pcfx">Mednafen/Beetle PCFX</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_psx">Mednafen/Beetle PSX</a>
-                          <!--<a class="dropdown-item" href="." data-core="mednafen_saturn">Mednafen/Beetle Saturn</a>-->
-                          <a class="dropdown-item" href="." data-core="mednafen_snes">Mednafen/Beetle SNES</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_vb">Mednafen/Beetle Virtual Boy</a>
-                          <a class="dropdown-item" href="." data-core="mednafen_wswan">Mednafen/Beetle WonderSwan</a>
-                          <a class="dropdown-item" href="." data-core="mupen64plus">Mupen64 Plus</a>
-                          <a class="dropdown-item" href="." data-core="nestopia">Nestopia</a>
-                          <a class="dropdown-item" href="." data-core="nxengine">NX Engine</a>
-                          <a class="dropdown-item" href="." data-core="o2em">O2em</a>
-                          <a class="dropdown-item" href="." data-core="picodrive">PicoDrive</a>
-                          <a class="dropdown-item" href="." data-core="prboom">PrBoom</a>
-                          <a class="dropdown-item" href="." data-core="quicknes">QuickNES</a>
-                          <a class="dropdown-item" href="." data-core="snes9x2002">Snes9x 2002</a>
-                          <a class="dropdown-item" href="." data-core="snes9x2005">Snes9x 2005</a>
-                          <a class="dropdown-item" href="." data-core="snes9x2010">Snes9x 2010</a>
-                          <a class="dropdown-item" href="." data-core="snes9x">Snes9x</a>
-                          <a class="dropdown-item" href="." data-core="stella">Stella</a>
-                          <a class="dropdown-item" href="." data-core="tgbdual">TGB Dual</a>
-                          <a class="dropdown-item" href="." data-core="tyrquake">TyrQuake</a>
-                          <a class="dropdown-item" href="." data-core="vba_next">VBA Next</a>
-                          <a class="dropdown-item" href="." data-core="vecx">Vecx</a>
-                          <a class="dropdown-item" href="." data-core="virtualjaguar">Virtual Jaguar</a>
-                          <a class="dropdown-item" href="." data-core="yabause">Yabause</a>
-                       </div>
-
-                      <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()" disabled>
-                         <span class="fa fa-spinner fa-spin" id="icnRun"></span> Run
-                      </button>
-                      <button class="btn btn-primary disabled" id="btnAdd" onclick="document.getElementById('btnRom').click()" disabled>
-                         <span class="fa fa-plus" id="icnAdd"></span> Add Content
-                      </button>
-                      <input class="btn btn-primary disabled" style="display: none" type="file" id="btnRom" name="upload" onclick="document.getElementById('btnAdd').click();" onchange="selectFiles(event.target.files)" multiple />
-                      <button class="btn btn-primary disabled" id="btnFullscreen" onclick="Module.requestFullScreen()" title="Fullscreen" disabled>
-                         <span class="fa fa-desktop" id="icnAdd"></span> <span class="sr-only">Fullscreen</span>
-                      </button>
-                      <button class="btn btn-primary disabled" id="btnMenu" onclick="keyPress(112);" title="Menu toggle" disabled>
-                        <span class="fa fa-bars" id="btnMenu"></span> <span class="sr-only">Menu</span>
-                      </button>
+                  <li class="nav-item dropdown">
+                        <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Core Selection</button>
+                        <div class="dropdown-menu dropdown-primary" aria-labelledby="dropdownMenu1" data-dropdown-in="fadeIn" data-dropdown-out="fadeOut" id="core-selector">
+                           <a class="dropdown-item" href="." data-core="2048">2048</a>
+                           <a class="dropdown-item" href="." data-core="4do">4DO</a>
+                           <a class="dropdown-item" href="." data-core="bluemsx">BlueMSX</a>
+                           <a class="dropdown-item" href="." data-core="craft">Craft</a>
+                           <a class="dropdown-item" href="." data-core="desmume">DeSmuME</a>
+                           <a class="dropdown-item" href="." data-core="dosbox">DOSBox</a>
+                           <a class="dropdown-item" href="." data-core="easyrpg">EasyRPG</a>
+                           <a class="dropdown-item" href="." data-core="fbalpha2012">FB Alpha 2012</a>
+                           <a class="dropdown-item" href="." data-core="fbalpha2012_cps1">FB Alpha 2012 CPS1</a>
+                           <a class="dropdown-item" href="." data-core="fbalpha2012_cps2">FB Alpha 2012 CPS2</a>
+                           <a class="dropdown-item" href="." data-core="fbalpha2012_neo">FB Alpha 2012 NeoGeo</a>
+                           <a class="dropdown-item" href="." data-core="fceumm">FCEUmm</a>
+                           <a class="dropdown-item" href="." data-core="ffmpeg">FFmpeg</a>
+                           <a class="dropdown-item" href="." data-core="gambatte">Gambatte</a>
+                           <a class="dropdown-item" href="." data-core="genesis_plus_gx">Genesis Plus GX</a>
+                           <a class="dropdown-item" href="." data-core="gme">Game Music Emu</a>
+                           <a class="dropdown-item" href="." data-core="gpsp">gPSP</a>
+                           <a class="dropdown-item" href="." data-core="handy">Handy</a>
+                           <a class="dropdown-item" href="." data-core="mame2000">MAME 2000</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_lynx">Mednafen Lynx</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_ngp">Mednafen Neo Geo Pocket</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_pce_fast">Mednafen PC Engine Fast</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_pcfx">Mednafen/Beetle PCFX</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_psx">Mednafen/Beetle PSX</a>
+                           <!--<a class="dropdown-item" href="." data-core="mednafen_saturn">Mednafen/Beetle Saturn</a>-->
+                           <a class="dropdown-item" href="." data-core="mednafen_snes">Mednafen/Beetle SNES</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_vb">Mednafen/Beetle Virtual Boy</a>
+                           <a class="dropdown-item" href="." data-core="mednafen_wswan">Mednafen/Beetle WonderSwan</a>
+                           <a class="dropdown-item" href="." data-core="mupen64plus">Mupen64 Plus</a>
+                           <a class="dropdown-item" href="." data-core="nestopia">Nestopia</a>
+                           <a class="dropdown-item" href="." data-core="nxengine">NX Engine</a>
+                           <a class="dropdown-item" href="." data-core="o2em">O2em</a>
+                           <a class="dropdown-item" href="." data-core="picodrive">PicoDrive</a>
+                           <a class="dropdown-item" href="." data-core="prboom">PrBoom</a>
+                           <a class="dropdown-item" href="." data-core="quicknes">QuickNES</a>
+                           <a class="dropdown-item" href="." data-core="snes9x2002">Snes9x 2002</a>
+                           <a class="dropdown-item" href="." data-core="snes9x2005">Snes9x 2005</a>
+                           <a class="dropdown-item" href="." data-core="snes9x2010">Snes9x 2010</a>
+                           <a class="dropdown-item" href="." data-core="snes9x">Snes9x</a>
+                           <a class="dropdown-item" href="." data-core="stella">Stella</a>
+                           <a class="dropdown-item" href="." data-core="tgbdual">TGB Dual</a>
+                           <a class="dropdown-item" href="." data-core="tyrquake">TyrQuake</a>
+                           <a class="dropdown-item" href="." data-core="vba_next">VBA Next</a>
+                           <a class="dropdown-item" href="." data-core="vecx">Vecx</a>
+                           <a class="dropdown-item" href="." data-core="virtualjaguar">Virtual Jaguar</a>
+                           <a class="dropdown-item" href="." data-core="yabause">Yabause</a>
+                        </div>
+                        <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()" disabled>
+                           <span class="fa fa-spinner fa-spin" id="icnRun"></span> Run
+                        </button>
+                        <button class="btn btn-primary disabled" id="btnAdd" onclick="document.getElementById('btnRom').click()" disabled>
+                           <span class="fa fa-plus" id="icnAdd"></span> Add Content
+                        </button>
+                        <button class="btn btn-primary enabled" id="btnClean" onclick="cleanupStorage();" title="Cleanup" disabled>
+                           <span class="fa fa-trash-o" id="btnCleanup"></span> <span class="sr-only">Cleanup</span>
+                        </button>
+                        <input class="btn btn-primary disabled" style="display: none" type="file" id="btnRom" name="upload" onclick="document.getElementById('btnAdd').click();" onchange="selectFiles(event.target.files)" multiple />
+                        <button class="btn btn-primary disabled" id="btnMenu" onclick="keyPress(112);" title="Menu toggle" disabled>
+                           <span class="fa fa-bars" id="btnMenu"></span> <span class="sr-only">Menu</span>
+                        </button>
+                        <button class="btn btn-primary disabled" id="btnFullscreen" onclick="Module.requestFullScreen()" title="Fullscreen" disabled>
+                           <span class="fa fa-desktop" id="icnAdd"></span> <span class="sr-only">Fullscreen</span>
+                        </button>
                    </li>
                 </div>
                </ul>
@@ -114,18 +114,18 @@
    </div>
    <div class="container">
       <div class="row">
-         <div class="col-sm-12 form-group btn-group text-xs-center p-t-2">
+         <div class="col-sm-12 form-group btn-group text-xs-left p-t-2">
             <div class="btn-group" data-toggle="buttons">
                <label class="btn btn-primary" id="lblLocal" onclick=switchStorage("browser")>
                   <input type="radio" name="options" id="btnLocal" autocomplete="off" checked>
                      <span class="fa fa-globe" id="icnLocal"></span> Browser
                   </input>
                  </label>
-               <label class="btn btn-primary" id="lblDrop" onclick=switchStorage("dropbox")>
+                 <label class="btn btn-primary" id="lblDrop" onclick=switchStorage("dropbox")>
                   <input type="radio" name="options" id="btnDrop" autocomplete="off">
                      <span class="fa fa-dropbox" id="icnDrop"></span> Dropbox
                   </input>
-              </label>
+                 </label>
             </div>
          </div>
       </div>
@@ -136,7 +136,6 @@
                      <textarea id="output" rows="15"></textarea>
                 </div>
             </div>
-
          </div>
       </div>
    </div>
diff --git a/pkg/emscripten/libretro/libretro.js b/pkg/emscripten/libretro/libretro.js
index 76205bb2f8..e34de6d80a 100644
--- a/pkg/emscripten/libretro/libretro.js
+++ b/pkg/emscripten/libretro/libretro.js
@@ -45,6 +45,11 @@ var showError = function(error) {
   }
 };
 
+function cleanupStorage()
+{
+   localStorage.clear();
+}
+
 function dropboxInit()
 {
   document.getElementById('btnRun').disabled = true;
@@ -329,6 +334,7 @@ $(function() {
          $('#lblLocal').addClass('active');
          preLoadingComplete();
          setupFileSystem("browser");
+         document.getElementById("btnClean").disabled = false;
       }
    });
  });