diff --git a/data/interfaces/default/album.html b/data/interfaces/default/album.html
index d5b1b54a..fd4d99fe 100644
--- a/data/interfaces/default/album.html
+++ b/data/interfaces/default/album.html
@@ -129,10 +129,11 @@
 	
 	function getAlbumArt() {
 		var id = "${album['AlbumID']}";
+		var name = "${album['AlbumTitle']}";
 		var image = $("div#albumImg img#albumImg");
 		if ( !image.hasClass('done') ) {
 			image.addClass('done');
-			getArtwork(image,id,'album');
+			getArtwork(image,id,name,'album');
 		}
 	}
 	
@@ -146,6 +147,9 @@
 		getAlbumInfo();
 		getAlbumArt();
 		initActions();
+		setTimeout(function(){
+			initFancybox();
+			},1000);
 		
 		$('#track_table').dataTable({
 			"aaSorting": [],
@@ -154,8 +158,6 @@
 			"bPaginate": false
 		});
 	});
-	$(window).load(function(){
-		initFancybox();
-	});
+
 	</script>
 </%def>
diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html
index 560b1732..71165052 100644
--- a/data/interfaces/default/artist.html
+++ b/data/interfaces/default/artist.html
@@ -27,7 +27,7 @@
 <%def name="body()">
 	<div id="artistheader" class="clearfix">
 		<div id="artistImg">
-			<img id="artistImg" class="albumArt" alt="${artist['ArtistName']}"/>
+			<img id="artistImage" class="albumArt" alt="${artist['ArtistName']}" height="200" />
 		</div>
 		<h1>	
 			%if artist['Status'] == 'Loading':	
@@ -109,7 +109,7 @@
 			%>
 			<tr class="grade${grade}">
 				<td id="select"><input type="checkbox" name="${album['AlbumID']}" class="checkbox" /></td>
-				<td id="albumart"><img title="${album['AlbumID']}" height="64" width="64"></td>
+				<td id="albumart"><img class="albumArt" title="${album['AlbumID']}" height="64" width="64"></td>
 				<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
 				<td id="reldate">${album['ReleaseDate']}</td>
 				<td id="type">${album['Type']}</td>
@@ -151,10 +151,11 @@
 	
 	function getArtistArt() {
 		var id = "${artist['ArtistID']}";
-		var image = $("div#artistImg img#artistImg");
+		var name = "${artist['ArtistName']}";
+		var image = $("div#artistImg img#artistImage");
 		if ( !image.hasClass('done') ) {
 			image.addClass('done');
-			getArtwork(image,id,'artist');
+			getArtwork(image,id,name,'artist');
 		}
 	}
 	
@@ -220,10 +221,6 @@
 		initActions();
 		initThisPage();
 	});
-	$(window).load(function(){
-		setTimeout(function(){
-			initFancybox();
-		},1000)
-	});
+
 	</script>
 </%def>
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 6f7a00de..41bd06a8 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -17,12 +17,12 @@ function getThumb(imgElem,id,type) {
 				var imageUrl = data;
 				}
 			$(imgElem).attr("src",imageUrl).hide().fadeIn();
-			$(imgElem).wrap('<a href="'+ imageLarge +'" rel="dialog" title="' + name + '"></a>');
+			// $(imgElem).wrap('<a href="'+ imageLarge +'" rel="dialog" title="' + name + '"></a>');
 			}
 	});
 }
 
-function getArtwork(imgElem,id,type) {
+function getArtwork(imgElem,id,name,type) {
 	
 	if ( type == 'artist' ) {
 		var artworkURL = "getArtwork?ArtistID=" + id;
@@ -40,8 +40,8 @@ function getArtwork(imgElem,id,type) {
 			else {
 				var imageUrl = data;
 				}
-			$(imgElem).attr("src",imageUrl).removeAttr("width").removeAttr("height").hide().fadeIn();
-			$(imgElem).wrap('<a href="'+ imageLarge +'" rel="dialog" title="' + name + '"></a>');
+			$(imgElem).attr("src",imageUrl).hide().fadeIn();
+			$(imgElem).wrap('<a href="'+ imageUrl +'" rel="dialog" title="' + name + '"></a>');
 			}
 	});
 }