diff --git a/mainwindow.cpp b/mainwindow.cpp
index cd319f1..0340e52 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -557,6 +557,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   ui->actionNone->setActionGroup(saveGroup);
   ui->actionSave_decoded->setActionGroup(saveGroup);
   ui->actionSave_all->setActionGroup(saveGroup);
+  saveGroup->setVisible(false);
 
   QActionGroup* DepthGroup = new QActionGroup(this);
   ui->actionQuickDecode->setActionGroup(DepthGroup);
@@ -921,15 +922,15 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   //UI Customizations & Tweaks
   m_wideGraph.data()->installEventFilter(new EscapeKeyPressEater());
   ui->mdiArea->addSubWindow(m_wideGraph.data(), Qt::Dialog | Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::Tool)->showMaximized();
-  //ui->menuDecode->setEnabled(true);
   ui->menuMode->setVisible(false);
-  ui->menuSave->setEnabled(true);
+  ui->menuSave->setEnabled(false);
   ui->menuTools->setEnabled(false);
   ui->menuView->setEnabled(false);
   foreach(auto action, ui->menuBar->actions()){
       if(action->text() == "Old View") ui->menuBar->removeAction(action);
       if(action->text() == "Old Mode") ui->menuBar->removeAction(action);
       if(action->text() == "Old Tools") ui->menuBar->removeAction(action);
+      if(action->text() == "Old &Save") ui->menuBar->removeAction(action);
   }
   ui->dxCallEntry->clear();
   ui->dxGridEntry->clear();
@@ -4086,7 +4087,10 @@ bool MainWindow::decode(){
     }
 
     decodeStart();
+
+#if JS8_SAVE_AUDIO
     decodePrepareSaveAudio(submode);
+#endif
     return true;
 }
 
diff --git a/mainwindow.ui b/mainwindow.ui
index 6e249d7..abc185e 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -4370,7 +4370,7 @@ list. The list can be maintained in Settings (F2).</string>
       <property name="visible">
        <bool>false</bool>
       </property>
-      <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,2,2,2,0,2,2,2,2,2,0,2,1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,2,2,2,0,2,2,2,2,2,0,2">
        <item>
         <widget class="QCheckBox" name="cbCQonly">
          <property name="visible">
@@ -4638,7 +4638,7 @@ list. The list can be maintained in Settings (F2).</string>
    </widget>
    <widget class="QMenu" name="menuSave">
     <property name="title">
-     <string>&amp;Save</string>
+     <string>Old &amp;Save</string>
     </property>
     <addaction name="actionNone"/>
     <addaction name="actionSave_decoded"/>
@@ -4793,7 +4793,6 @@ list. The list can be maintained in Settings (F2).</string>
    <addaction name="menuFile"/>
    <addaction name="menuConfig"/>
    <addaction name="menuModeJS8"/>
-   <addaction name="menuSave"/>
    <addaction name="menu_Log"/>
    <addaction name="menuWindow"/>
    <addaction name="menuControl"/>
@@ -4801,6 +4800,7 @@ list. The list can be maintained in Settings (F2).</string>
    <addaction name="menuView"/>
    <addaction name="menuMode"/>
    <addaction name="menuTools"/>
+   <addaction name="menuSave"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionExit">