more logical right-click menu structures

ui/coverart_artist_pop_rb3.ui

@@ -7,14 +7,16 @@
         <attribute name="label" translatable="yes">Play All</attribute>
         <attribute name="action">win.play_album_menu_item</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">Queue All</attribute>
-        <attribute name="action">win.queue_album_menu_item</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Add to playing</attribute>
         <attribute name="action">win.add_to_playing_menu_item</attribute>
       </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Queue All</attribute>
+        <attribute name="action">win.queue_album_menu_item</attribute>
+      </item>
       <submenu>
           <attribute name="label" translatable="yes">Add to Playlist</attribute>
         <section>

ui/coverart_browser_pop_rb3.ui

@@ -11,30 +11,34 @@
         <attribute name="label" translatable="yes">Play Next</attribute>
         <attribute name="action">win.play_next_menu_item</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">Queue Album</attribute>
-        <attribute name="action">win.queue_album_menu_item</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Add to playing</attribute>
         <attribute name="action">win.add_to_playing_menu_item</attribute>
       </item>
+    </section>
+    <section>
       <item>
+        <attribute name="label" translatable="yes">Queue Album</attribute>
+        <attribute name="action">win.queue_album_menu_item</attribute>
+      </item>
+      <submenu>
+            <attribute name="label" translatable="yes">Add to Playlist</attribute>
+            <section>
+              <item>
+                <attribute name="label" translatable="yes">New Playlist</attribute>
+                <attribute name="action">win.new_playlist</attribute>
+              </item>
+            </section>
+            <section>
+                <attribute name="rb-plugin-menu-link">playlist_section</attribute>
+            </section>         
+      </submenu>
+    </section>
+    <section>
+    <item>
         <attribute name="label" translatable="yes">Play Similar Artist</attribute>
         <attribute name="action">win.play_similar_artist_menu_item</attribute>
       </item>
-      <submenu>
-          <attribute name="label" translatable="yes">Add to Playlist</attribute>
-        <section>
-          <item>
-            <attribute name="label" translatable="yes">New Playlist</attribute>
-            <attribute name="action">win.new_playlist</attribute>
-          </item>
-        </section>
-        <section>
-            <attribute name="rb-plugin-menu-link">playlist_section</attribute>
-        </section>         
-      </submenu>
     </section>
     <section>
       <item>

ui/coverart_entryview_compact_pop_rb3.ui

@@ -10,31 +10,16 @@
         <attribute name="label" translatable="yes">Play Next</attribute>
         <attribute name="action">win.ev_compact_play_next_track_menu_item</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">Queue Track</attribute>
-        <attribute name="action">win.ev_compact_queue_track_menu_item</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Add to playing</attribute>
         <attribute name="action">win.ev_compact_add_to_playing_menu_item</attribute>
       </item>
-      <submenu>
-        <attribute name="label" translatable="yes">Play Similar</attribute>
-        <section>
-            <item>
-                <attribute name="label" translatable="yes">Track</attribute>
-                <attribute name="action">win.ev_compact_similar_track_menu_item</attribute>
-            </item>
-            <item>
-                <attribute name="label" translatable="yes">Artist</attribute>
-                <attribute name="action">win.ev_compact_similar_artist_menu_item</attribute>
-            </item>
-            <item>
-                <attribute name="label" translatable="yes">Genre</attribute>
-                <attribute name="action">win.ev_compact_similar_genre_menu_item</attribute>
-            </item>
-        </section>
-      </submenu>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Queue Track</attribute>
+        <attribute name="action">win.ev_compact_queue_track_menu_item</attribute>
+      </item>
       <submenu>
         <attribute name="label" translatable="yes">Add to Playlist</attribute>
         <section>
@@ -48,6 +33,25 @@
         </section> 
       </submenu>
      </section>
+     <section>
+         <submenu>
+            <attribute name="label" translatable="yes">Play Similar</attribute>
+            <section>
+                <item>
+                    <attribute name="label" translatable="yes">Track</attribute>
+                    <attribute name="action">win.ev_compact_similar_track_menu_item</attribute>
+                </item>
+                <item>
+                    <attribute name="label" translatable="yes">Artist</attribute>
+                    <attribute name="action">win.ev_compact_similar_artist_menu_item</attribute>
+                </item>
+                <item>
+                    <attribute name="label" translatable="yes">Genre</attribute>
+                    <attribute name="action">win.ev_compact_similar_genre_menu_item</attribute>
+                </item>
+            </section>
+          </submenu>
+     </section>
      <section>
         <attribute name="rb-plugin-menu-link">ev_compact_entryview</attribute>
     </section>

ui/coverart_entryview_full_pop_rb3.ui

@@ -10,15 +10,31 @@
         <attribute name="label" translatable="yes">Play Next</attribute>
         <attribute name="action">win.ev_full_play_next_track_menu_item</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">Queue Track</attribute>
-        <attribute name="action">win.ev_full_queue_track_menu_item</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Add to playing</attribute>
         <attribute name="action">win.ev_full_add_to_playing_menu_item</attribute>
       </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Queue Track</attribute>
+        <attribute name="action">win.ev_full_queue_track_menu_item</attribute>
+      </item>
       <submenu>
+        <attribute name="label" translatable="yes">Add to Playlist</attribute>
+        <section>
+            <item>
+                <attribute name="label" translatable="yes">New Playlist</attribute>
+                <attribute name="action">win.ev_full_new_playlist</attribute>
+            </item>
+        </section>
+        <section>
+            <attribute name="rb-plugin-menu-link">ev_full_playlist_section</attribute>
+        </section> 
+      </submenu>
+     </section>
+     <section>
+     <submenu>
         <attribute name="label" translatable="yes">Play Similar</attribute>
         <section>
             <item>
@@ -35,18 +51,6 @@
             </item>
         </section>
       </submenu>
-      <submenu>
-        <attribute name="label" translatable="yes">Add to Playlist</attribute>
-        <section>
-            <item>
-                <attribute name="label" translatable="yes">New Playlist</attribute>
-                <attribute name="action">win.ev_full_new_playlist</attribute>
-            </item>
-        </section>
-        <section>
-            <attribute name="rb-plugin-menu-link">ev_full_playlist_section</attribute>
-        </section> 
-      </submenu>
      </section>
      <section>
         <attribute name="rb-plugin-menu-link">ev_full_entryview</attribute>