diff -upBr MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html server/Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html
--- MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html	2005-03-09 04:38:00.000000000 -0800
+++ server/Plugins/MusicMagic/HTML/Default/plugins/MusicMagic/musicmagic_mix_list.html	2005-03-24 10:34:54.937500000 -0800
@@ -1,6 +1,10 @@
 <tr>
   <td width="100%" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
       <a href="[% webroot %]songinfo.html?item=[% item %]&player=[% player | uri %]">[% title %]</a>
+      [% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
+      <i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
+      [% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
+      <a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
   </td>
   <td align="right" width="13" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/images/b_play.gif" width=13 height=13 alt="[% "PLAY" | string %]" title="[% "PLAY" | string %]"></a></nobr>
diff -upBr MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html server/Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html
--- MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html	2005-03-09 04:38:00.000000000 -0800
+++ server/Plugins/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix_list.html	2005-03-24 10:35:00.359375000 -0800
@@ -1,6 +1,10 @@
 <tr>
   <td [% IF odd %]class="odd" bgcolor="#d0d0d0"[% ELSE %]class="even" bgcolor="#FFFFFF"[% END %]>
       <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% title %]</a>
+      [% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
+      <i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
+      [% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
+      <a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
   </td>
   <td align="right" width="13" [% IF odd %]class="odd" bgcolor="#d0d0d0"[% ELSE %]class="even" bgcolor="#FFFFFF"[% END %]>
       <nobr><a href="[% webroot %]status.html?p0=playlist&p1=play&p2=[% itempath | uri %]&player=[% player | uri %]" target="status">[% "PLAY" | string %]</a></nobr>
diff -upBr MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html server/Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html
--- MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html	2005-03-09 04:38:00.000000000 -0800
+++ server/Plugins/MusicMagic/HTML/Fishbone/plugins/MusicMagic/musicmagic_mix_list.html	2005-03-24 13:06:38.859375000 -0800
@@ -1,7 +1,12 @@
 <tr>
-  <td  class="listing">&nbsp;<nobr>
-	  [% IF anchor %]<a name="[% anchor %]"></a>[% END %]
-      <a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]">[% title %]</a>
+	<td  class="listing">&nbsp;<nobr>
+	[% IF anchor %]<a name="[% anchor %]"></a>[% END %]
+		<a href="[% webroot %]songinfo.html?item=[% item | uri %]&player=[% player | uri %]"><b>[% text %]</b></a>
+		[% IF includeArtist && artist && artist != noArtist %][% "BY" | string %] 
+		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% itemobj.contributorsOfType('artist').first.id %]&player=[% player | uri %]" target="browser">[% artist | html %]</a>[% END %]
+		[% IF includeAlbum && album  && album != noAlbum %][% "FROM" | string %]
+		<i><a href="[% webroot %]browsedb.html?hierarchy=album,track&level=1&album=[% itemobj.album.id %]&player=[% player | uri %]" target="browser">[% album | html %]</a></i>[% END %]
+
   </nobr></td>
   <td  class="listing" width="11" align="center">
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=insert&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/queue.gif" border=0 align="center" width="6" height="9" onMouseOver="self.status='Queue This Item';return true"></a></nobr>
@@ -18,6 +23,9 @@
   <td  class="listing" width="11" align="center">
       <nobr><a href="[% webroot %]status_header.html?p0=playlist&p1=deleteitem&p2=[% itempath | uri %]&player=[% player | uri %]" target="status"><img src="[% webroot %]html/subtract.gif" border=0 align="center" width="8" height="8" onMouseOver="self.status='Delete List';return true"></a></nobr>
   </td>
+  	[% FOREACH mixer = mixerlinks.values.sort %]
+		[% PROCESS $mixer %]
+	[% END %]
   <td  class="listing" width="3" align="center">&nbsp;</td>
 </tr>
 
diff -upBr MusicMagic/Plugin.pm server/Plugins/MusicMagic/Plugin.pm
--- MusicMagic/Plugin.pm	2005-03-24 05:30:00.000000000 -0800
+++ server/Plugins/MusicMagic/Plugin.pm	2005-03-24 13:10:17.671875000 -0800
@@ -946,6 +946,8 @@ sub musicmagic_mix {
 	my $player = $params->{'player'};
 	my $p0     = $params->{'p0'};
 
+	my $composerIn   = Slim::Utils::Prefs::get('composerInArtists');
+	
 	my $itemnumber = 0;
 	my $ds = Slim::Music::Info::getCurrentDataStore();
 
@@ -1025,21 +1027,40 @@ sub musicmagic_mix {
 
 		my %list_form = %$params;
 		my $webFormat = Slim::Utils::Prefs::getInd("titleFormat",Slim::Utils::Prefs::get("titleFormatWeb"));
+		my $fieldInfo = Slim::Web::Pages::fieldInfo();
 
 		# If we can't get an object for this url, skip it, as the
 		# user's database is likely out of date. Bug 863
 		my $trackObj  = $ds->objectForUrl($item) || next;
 		
-		$list_form{'artist'}        = $track ? $track->artist() : $artist;
-		$list_form{'album'}         = $track ? $track->album() : $album;
-		$list_form{'genre'}         = $genre;
-		$list_form{'player'}        = $player;
-		$list_form{'itempath'}      = $item; 
-		$list_form{'item'}          = $trackObj->id; 
-		$list_form{'title'}         = Slim::Music::Info::infoFormat($trackObj, $webFormat, 'TITLE');
-		$list_form{'includeArtist'} = ($webFormat !~ /ARTIST/);
-		$list_form{'includeAlbum'}  = ($webFormat !~ /ALBUM/) ;
-		$list_form{'odd'}           = ($itemnumber + 1) % 2;
+		my $itemname = &{$fieldInfo->{'track'}->{'resultToName'}}($trackObj);
+		&{$fieldInfo->{'track'}->{'listItem'}}($ds, \%list_form, $trackObj, $itemname, 0);
+		
+#		use Data::Dumper;
+#		print Dumper(\%list_form);
+#		
+#		$list_form{'genre'}         = $genre;
+#		$list_form{'player'}        = $player;
+#		$list_form{'itempath'}      = $item; 
+#		$list_form{'item'}          = $trackObj->id; 
+#		$list_form{'itemObj'}       = $trackObj;
+#		$list_form{'title'}         = Slim::Music::Info::infoFormat($trackObj, $webFormat, 'TITLE');
+#		$list_form{'includeArtist'} = ($webFormat !~ /ARTIST/);
+#		$list_form{'includeAlbum'}  = ($webFormat !~ /ALBUM/) ;
+#		$list_form{'odd'}           = ($itemnumber + 1) % 2;
+#		$list_form{'album'}         = $list_form{'includeArtist'} ? $trackObj->album() : undef;
+#		
+#		if ($list_form{'includeArtist'} && $trackObj) {
+#
+#			if ($composerIn) {
+#				if (my ($contributor) = $trackObj->contributors()) {
+#					$list_form{'artist'}   = $contributor->name();
+#					$list_form{'artistid'} = $contributor->id();
+#				}
+#			} else {
+#				$list_form{'artist'} = $trackObj->artist();
+#			}
+#		}
 
 		$itemnumber++;