diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
index c027b0fa..ac38b74c 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
@@ -4,7 +4,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
     <script type="text/javascript" language="javascript">
         function enableLdapFields() {
             $("#ldap").is(":checked") ? $("#ldapTable").show() : $("#ldapTable").hide();
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
index ea7032e0..e4367e34 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
@@ -5,7 +5,6 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/starService.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/playlistService.js"/>"></script>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
index bc6a5979..b84a8228 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
@@ -24,7 +24,6 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
     <script type="text/javascript" src="<c:url value='/dwr/util.js'/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/starService.js"/>"></script>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
index 4cc78e33..ce6d17b3 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
@@ -21,7 +21,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
 </head>
 
 <body class="mainframe bgcolor1">
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
index 13301e4e..48e38e10 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
@@ -4,7 +4,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
 </head>
 
 <body class="mainframe bgcolor1">
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
index 3cb4686b..512d43b7 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
@@ -3,7 +3,7 @@
 
 <html><head>
     <%@ include file="head.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
 </head>
 <body class="mainframe bgcolor1">
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
index 2b97c022..22adce6a 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
@@ -3,7 +3,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/util.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/playlistService.js"/>"></script>
     <script type="text/javascript" language="javascript">
@@ -111,8 +111,8 @@
     <div id="playlists"></div>
     <div id="playlistOverflow" style="display:none"></div>
     <div style="padding-top: 0.3em"></div>
-    <div class="forward" id="showAllPlaylists" style="display: none"><a href="javascript:noop()" onclick="showAllPlaylists()"><fmt:message key="left.showallplaylists"/></a></div>
-    <div class="forward"><a href="javascript:noop()" onclick="createEmptyPlaylist()"><fmt:message key="left.createplaylist"/></a></div>
+    <div class="forward" id="showAllPlaylists" style="display: none"><a href="#" onclick="showAllPlaylists()"><fmt:message key="left.showallplaylists"/></a></div>
+    <div class="forward"><a href="#" onclick="createEmptyPlaylist()"><fmt:message key="left.createplaylist"/></a></div>
     <div class="forward"><a href="importPlaylist.view" target="main"><fmt:message key="left.importplaylist"/></a></div>
 </div>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
index 85ee71cc..843678ff 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
@@ -4,7 +4,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
 
     <script type="text/javascript" language="javascript">
         function enableLastFmFields() {
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
index 09d8ef9c..008cf13c 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@@ -3,7 +3,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/playQueueService.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/playlistService.js"/>"></script>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
index f546293e..290081e7 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
@@ -4,7 +4,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
 </head>
 <body class="mainframe bgcolor1">
 <script type="text/javascript" src="<c:url value="/script/wz_tooltip.js"/>"></script>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
index 63e87ed4..48a14d4d 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
@@ -7,7 +7,7 @@
     <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/util.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/nowPlayingService.js"/>"></script>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
 
     <script type="text/javascript">
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
index 6bc964ff..d1b9296f 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
@@ -3,7 +3,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/util.js"/>"></script>
     <script type="text/javascript" src="<c:url value='/dwr/util.js'/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>
     <script type="text/javascript" src="<c:url value="/dwr/interface/starService.js"/>"></script>
@@ -143,10 +143,10 @@
     </table>
 
     <div class="forward" style="float:left;padding-right:1.5em">
-        <a href="javascript:noop()" onclick="onSavePlaylist()"><fmt:message key="playlist.save"/></a>
+        <a href="#" onclick="onSavePlaylist()"><fmt:message key="playlist.save"/></a>
     </div>
     <div class="forward" style="float: left">
-        <a href="javascript:noop()" onclick="onPlayAll()"><fmt:message key="main.playall"/></a>
+        <a href="#" onclick="onPlayAll()"><fmt:message key="main.playall"/></a>
     </div>
     <div style="clear: both"></div>
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
index 3f4d8443..539a5983 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
@@ -4,7 +4,7 @@
 <html><head>
     <%@ include file="head.jsp" %>
     <%@ include file="jquery.jsp" %>
-    <script type="text/javascript" src="<c:url value="/script/scripts-2.0.js"/>"></script>
+    <script type="text/javascript" src="<c:url value="/script/utils.js"/>"></script>
     <script type="text/javascript">
         function init() {
             enablePasswordChangeFields();
diff --git a/airsonic-main/src/main/webapp/script/scripts-2.0.js b/airsonic-main/src/main/webapp/script/scripts-2.0.js
deleted file mode 100644
index bce14a66..00000000
--- a/airsonic-main/src/main/webapp/script/scripts-2.0.js
+++ /dev/null
@@ -1,41 +0,0 @@
-
-//
-// REMEMBER TO UPDATE VERSION WHEN CHANGING THIS SCRIPT, IN ORDER FOR BROWSERS TO REFRESH IT.
-//
-
-var entityMap = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': '&quot;',
-    "'": '&#39;',
-    "/": '&#x2F;'
-};
-
-function escapeHtml(string) {
-    return String(string).replace(/[&<>"'\/]/g, function (s) {
-        return entityMap[s];
-    });
-}
-
-function noop() {
-}
-
-function popup(mylink, windowname) {
-    return popupSize(mylink, windowname, 400, 200);
-}
-
-function popupSize(mylink, windowname, width, height) {
-    var href;
-    if (typeof(mylink) == "string") {
-        href = mylink;
-    } else {
-        href = mylink.href;
-    }
-
-    var w = window.open(href, windowname, "width=" + width + ",height=" + height + ",scrollbars=yes,resizable=yes");
-    w.focus();
-    w.moveTo(300, 200);
-    return false;
-}
-
diff --git a/airsonic-main/src/main/webapp/script/util.js b/airsonic-main/src/main/webapp/script/util.js
index 7e352b47..f895f136 100644
--- a/airsonic-main/src/main/webapp/script/util.js
+++ b/airsonic-main/src/main/webapp/script/util.js
@@ -1,10 +1,42 @@
+var entityMap = {
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': '&quot;',
+    "'": '&#39;',
+    "/": '&#x2F;'
+};
+
+function escapeHtml(string) {
+    return String(string).replace(/[&<>"'\/]/g, function (s) {
+        return entityMap[s];
+    });
+}
+
+function popup(mylink, windowname) {
+    return popupSize(mylink, windowname, 400, 200);
+}
+
+function popupSize(mylink, windowname, width, height) {
+    var href;
+    if (typeof(mylink) == "string") {
+        href = mylink;
+    } else {
+        href = mylink.href;
+    }
+
+    var w = window.open(href, windowname, "width=" + width + ",height=" + height + ",scrollbars=yes,resizable=yes");
+    w.focus();
+    w.moveTo(300, 200);
+    return false;
+}
+
 function updateQueryStringParameter(uri, key, value) {
     var re = new RegExp("([?&])" + key + "=.*?(&|$)", "i");
-    var separator = uri.indexOf('?') !== -1 ? "&" : "?";
     if (uri.match(re)) {
         return uri.replace(re, '$1' + key + "=" + value + '$2');
-    }
-    else {
+    } else {
+        var separator = uri.indexOf('?') !== -1 ? "&" : "?";
         return uri + separator + key + "=" + value;
     }
 }
