diff --git a/src/com_weblinks/admin/views/weblink/tmpl/edit.php b/src/com_weblinks/admin/views/weblink/tmpl/edit.php
index 64ca6f0..18afe40 100644
--- a/src/com_weblinks/admin/views/weblink/tmpl/edit.php
+++ b/src/com_weblinks/admin/views/weblink/tmpl/edit.php
@@ -11,19 +11,20 @@ defined('_JEXEC') or die;
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 
-?>
-<script type="text/javascript">
+JFactory::getDocument()->addScriptDeclaration("
+jQuery(document).ready(function() {
 	Joomla.submitbutton = function(task)
 	{
-		if (task == 'weblink.cancel' || document.formvalidator.isValid(document.id('weblink-form'))) {
-			<?php echo $this->form->getField('description')->save(); ?>
+		if (task == 'weblink.cancel' || document.formvalidator.isValid(document.getElementById('weblink-form'))) {
+			" . $this->form->getField('description')->save() . "
 			Joomla.submitform(task, document.getElementById('weblink-form'));
 		}
 	}
-</script>
+});");
+?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_weblinks&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="weblink-form" class="form-validate">
 
diff --git a/src/com_weblinks/admin/views/weblinks/tmpl/default.php b/src/com_weblinks/admin/views/weblinks/tmpl/default.php
index 1b00ae8..c528597 100644
--- a/src/com_weblinks/admin/views/weblinks/tmpl/default.php
+++ b/src/com_weblinks/admin/views/weblinks/tmpl/default.php
@@ -27,24 +27,26 @@ if ($saveOrder)
 	JHtml::_('sortablelist.sortable', 'weblinkList', 'adminForm', strtolower($listDirn), $saveOrderingUrl);
 }
 $sortFields = $this->getSortFields();
-?>
-<script type="text/javascript">
+
+JFactory::getDocument()->addScriptDeclaration('
+jQuery(document).ready(function() {
 	Joomla.orderTable = function()
 	{
 		table = document.getElementById("sortTable");
 		direction = document.getElementById("directionTable");
 		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $listOrder; ?>')
+		if (order != "' . $listOrder . '")
 		{
-			dirn = 'asc';
+			dirn = "asc";
 		}
 		else
 		{
 			dirn = direction.options[direction.selectedIndex].value;
 		}
-		Joomla.tableOrdering(order, dirn, '');
+		Joomla.tableOrdering(order, dirn, "");
 	}
-</script>
+		});');
+?>
 <form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=weblinks'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if (!empty( $this->sidebar)) : ?>
 	<div id="j-sidebar-container" class="span2">