diff --git a/main/link/link.php b/main/link/link.php
index 857bb394bc..1b23ae0cfa 100644
--- a/main/link/link.php
+++ b/main/link/link.php
@@ -241,6 +241,7 @@ if(api_get_setting('search_enabled')=='true') {
 		if ($_GET['action']=="editlink")
 		{
 			echo "<input type=\"hidden\" name=\"id\" value=\"".Security::remove_XSS($_GET['id'])."\" />";
+			$clean_link_id=trim(Security::remove_XSS($_GET['id']));
 		}
 
 		echo '	<div class="row">
@@ -260,7 +261,14 @@ if(api_get_setting('search_enabled')=='true') {
 						<input type="text" name="title" size="50" value="' . api_htmlentities($title,ENT_QUOTES,$charset) . '" />
 					</div>
 				</div>';
-
+		echo '	<div class="row">
+					<div class="label">
+						'.get_lang('Metadata').'
+					</div>
+					<div class="formw">
+						<a href="../metadata/index.php?eid='.urlencode('Link.'.$clean_link_id).'">'.get_lang('AddMetadata').'</a>
+					</div>
+				</div>';
 		echo '	<div class="row">
 					<div class="label">
 						'.get_lang('Description').'
diff --git a/main/metadata/md_link.htt b/main/metadata/md_link.htt
old mode 100755
new mode 100644
index d75f0870e2..293107b9a2
--- a/main/metadata/md_link.htt
+++ b/main/metadata/md_link.htt
@@ -33,8 +33,9 @@
 
 <form method="post" action="{-P self-}">
     <textarea rows="4" class="mda" name="mda" id="mda" title="{-L ConfirmDelete-}"></textarea>
-    <input type="submit" value="{-L Store-}" onClick="return checkBeforeSubmit(event);"></input>
-    <input type="submit" value="{-L DeleteAll-}" onClick="return setPendingOperation('~~', event);"></input>
+	<button class="save" type="submit" value="{-L Store-}" onClick="javascript: return checkBeforeSubmit(event);">{-L Store-}</button>
+	<button class="minus" type="submit" value="{-L DeleteAll-}" onClick="javascript:return setPendingOperation('~~', event);">{-L DeleteAll-}</button>
+
 </form>
 
 <textarea rows="10" class="mda" name="mdt" id="mdt">{-H {-P mdt-}-}</textarea>
diff --git a/main/newscorm/lp_edit.php b/main/newscorm/lp_edit.php
index 62fd3cffab..df61e3e25b 100644
--- a/main/newscorm/lp_edit.php
+++ b/main/newscorm/lp_edit.php
@@ -54,6 +54,11 @@ $form->addElement('text', 'lp_name', api_ucfirst(get_lang('_title')),array('size
 $form->applyFilter('lp_name', 'html_filter');
 $form->addRule('lp_name', get_lang('ThisFieldIsRequired'), 'required');
 
+//Metadata
+//$clean_scorm_id=Security::remove_XSS($_GET['lp_id']);
+//$metadata_link = '<a href="../metadata/index.php?eid='.urlencode('Scorm.'.$clean_scorm_id).'">'.get_lang('AddMetadata').'</a>';
+//$form->addElement('static',null,get_lang('Metadata'),$metadata_link);
+
 //Encoding
 $encoding_select = &$form->addElement('select', 'lp_encoding', get_lang('Charset'));
 $encodings = array('UTF-8','ISO-8859-1','ISO-8859-15','cp1251','cp1252','KOI8-R','BIG5','GB2312','Shift_JIS','EUC-JP');