diff --git a/ajax/import.php b/ajax/import.php
new file mode 100644
index 00000000..6264bc78
--- /dev/null
+++ b/ajax/import.php
@@ -0,0 +1,27 @@
+<?php
+
+OCP\App::checkAppEnabled('bookmarks');
+
+
+$l = new OC_l10n('bookmarks');
+
+if (isset($_FILES['bm_import'])) {
+	$error = array();
+
+	$file = $_FILES['bm_import']['tmp_name'];
+	if($_FILES['bm_import']['type'] =='text/html')	{
+		$error = OC_Bookmarks_Bookmarks::importFile($file);
+		if( empty($errors) ) {
+			OCP\JSON::success();
+			//force charset as not set by OC_JSON
+			header('Content-Type: application/json; charset=utf-8');
+			exit();
+		}
+	} else {
+		$error[]= $l->t('Unsupported file type for import');
+	}
+}
+OC_JSON::error(array('data'=>$error));
+//force charset as not set by OC_JSON
+header('Content-Type: application/json; charset=utf-8');
+exit();
diff --git a/appinfo/app.php b/appinfo/app.php
index 1b4e1ddf..84013d9d 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -17,7 +17,6 @@ OCP\App::addNavigationEntry( array( 'id' => 'bookmarks_index',
 	'name' => $l->t('Bookmarks')
 ));
 
-OCP\App::registerPersonal('bookmarks', 'settings');
 OCP\Util::addscript('bookmarks', 'bookmarksearch');
 
 OC_Search::registerProvider('OC_Search_Provider_Bookmarks');
diff --git a/css/bookmarks.css b/css/bookmarks.css
index 7fe274ae..3062ad9c 100644
--- a/css/bookmarks.css
+++ b/css/bookmarks.css
@@ -333,4 +333,41 @@ li:hover em { display : none; }
     position: absolute;
     right: 1em;
 		top: auto;
+}
+
+#bookmark_settings {
+    -moz-box-sizing: border-box;
+    background: none repeat scroll 0 0 #EEEEEE;
+    border-right: 1px solid #CCCCCC;
+    border-top: 1px solid #CCCCCC;
+    bottom: 0;
+    height: 2.8em;
+    margin: 0;
+    overflow: visible;
+    padding: 0;
+    position: fixed;
+    width: 20em;
+    z-index: 2;
+}
+#leftcontent #bookmark_settings li{
+	padding: 0;
+	background-color:transparent;
+}
+#leftcontent #bookmark_settings li:hover{
+	background-color:transparent;
+}
+
+#bookmark_settings .controls {
+    height: 100%;
+    width: 100%;
+}
+
+#bookmark_settings .controls > li:last-child button {
+    margin-right: 0.3em;
+}
+#bookmark_settings button {
+    height: 2.4em;
+    margin: 0.15em 0 0 0.15em;
+    padding: 0.2em 0.1em 0;
+    width: 2.4em;
 }
\ No newline at end of file
diff --git a/js/bookmarks.js b/js/bookmarks.js
index dba3cd25..0b5f4f08 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -9,6 +9,14 @@ $(document).ready(function() {
 	$('.centercontent').click(clickSideBar);
 	$('#view_type input').click(clickSwitchView);
 	$('#bookmark_add_submit').click(addBookmark);
+  $('#settingsbtn').on('click keydown', function() {
+		try {
+			OC.appSettings({appid:'bookmarks', loadJS:true, cache:false});
+		} catch(e) {
+			alert(e);
+		}
+	});
+
 	$(window).resize(function () {
 		fillWindow($('.bookmarks_list'));
 	});
diff --git a/js/settings.js b/js/settings.js
new file mode 100644
index 00000000..f005337d
--- /dev/null
+++ b/js/settings.js
@@ -0,0 +1,57 @@
+$(document).ready(function() {
+	$('#bm_import_submit').click(attachSettingEvent);
+});
+
+
+function attachSettingEvent(event) {
+	event.preventDefault();
+	fileUpload($(this).closest('form'), $('#upload'));
+}
+function fileUpload(form, result_div) {
+		
+	var uploadEventHandler = function () {
+		var data = {};
+		try{
+			data = $.parseJSON(iframe.contents().text());
+		}catch (e){}
+		if(data.status == 'error') {
+			list = $("<ul></ul>").addClass('setting_error_list');
+			console.log(data);
+			$.each(data.data,function(index, item){
+				list.append($( "<li></li>" ).text(item));
+			});
+			result_div.html(list);
+		} else {
+			result_div.text(t('bookmark', 'Import completed successfully.'));
+		}
+	};
+		
+	// Create the iframe...
+	var iframe;
+	if($('#upload_iframe').length === 1)
+		iframe = $('#upload_iframe')
+	else {
+		iframe = $('<iframe></iframe>').attr({
+			id: 'upload_iframe',
+			name: 'upload_iframe',
+			width: '0',
+			height: '0',
+			border: '0',
+			style: 'display:none'
+		}).bind('load',uploadEventHandler);
+		form.append(iframe);
+	}
+
+	// Set properties of form...
+	form.attr({
+		target: 'upload_iframe',
+		method: 'post',
+		enctype: 'multipart/form-data',
+		encoding: 'multipart/form-data'
+	});
+
+	// Submit the form...
+	form.submit();
+
+	result_div.text(t('bookmark', 'Uploading...'));
+}
\ No newline at end of file
diff --git a/settings.php b/settings.php
index 626bbc9e..dae1d581 100644
--- a/settings.php
+++ b/settings.php
@@ -8,25 +8,5 @@
 
 OCP\App::checkAppEnabled('bookmarks');
 
-if (isset($_POST['bm_import'])) {
-	$error = array();
-
-	$file = $_FILES['bm_import']['tmp_name'];
-	if($_FILES['bm_import']['type'] =='text/html')	{
-		$error = OC_Bookmarks_Bookmarks::importFile($file);
-
-	} else {
-		$error[]= array('error' => 'Unsupported file type for import',
-			'hint' => '');
-	}
-
-	$tmpl = new OCP\Template('bookmarks', 'settings');
-	// Any problems?
-	if(count($error)) {
-		$tmpl->assign('error', $error);
-	}
-	return $tmpl->fetchPage();
-} else {
-	$tmpl = new OCP\Template( 'bookmarks', 'settings');
-	return $tmpl->fetchPage();
-}
+$tmpl = new OCP\Template('bookmarks', 'settings');
+$tmpl->printPage();
diff --git a/templates/addBm.php b/templates/addBm.php
index 171b81c8..6457c551 100644
--- a/templates/addBm.php
+++ b/templates/addBm.php
@@ -1,6 +1,6 @@
 <form class="addBm" method="post" action="<?php echo OCP\Util::linkTo('bookmarks', 'ajax/editBookmark.php');?>">
 		<?php if(!isset($embedded) || !$embedded):?>
-			<script>
+			<script type="text/javascript">
 				var fullTags = <?php echo $_['tags'];?>;
 				$(document).ready(function() {
 					$('body').bookmark_dialog({
diff --git a/templates/bookmarklet.php b/templates/bookmarklet.php
index cc6b1d31..b645388c 100644
--- a/templates/bookmarklet.php
+++ b/templates/bookmarklet.php
@@ -2,7 +2,7 @@
 
 function createBookmarklet() {
 	$l = OC_L10N::get('bookmarks');
-	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
+	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small><br />'
 	. '<a class="button bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,e=document.title,d=a.open(\'' . OCP\Util::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location)+\'&title=\'+e,\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=400px,width=550px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
 	. $l->t('Read later') . '</a>';
 } 
diff --git a/templates/list.php b/templates/list.php
index c3946c9d..1ab0719e 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -31,6 +31,17 @@
 	<ul class="tag_list">
 	</ul>
 
+
+<div id="bookmark_settings">
+		<ul class="controls">
+			<li style="float: right">
+				<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">
+					<img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>"
+					alt="<?php echo $l->t('Settings'); ?>"   /></button>
+			</li>
+		</ul>
+	</div>
+
 </div>
 <div id="rightcontent" class="rightcontent">
 	<div class="bookmarks_list"></div>
@@ -41,6 +52,7 @@
 			require_once OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php' ;
 			createBookmarklet(); 
 		?>
+	<div id="appsettings" class="popup bottomleft hidden"></div>
 </div>
 <script>
 	var fullTags = <?php echo $_['tags'];?>;
diff --git a/templates/settings.php b/templates/settings.php
index 1dd3dd8d..e6bf63ae 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -6,29 +6,28 @@
  * See the COPYING-README file.
  */
 ?>
-<form id="bookmarks">
-		<fieldset class="personalblock">
-			<span class="bold"><?php echo $l->t('Bookmarklet <br />');?></span>
-			<?php
-			    require_once 'bookmarklet.php';
-			    createBookmarklet(); 
-			?>
-		</fieldset>
-</form>
 
-<form id="import_bookmark" action="#" method="post" enctype="multipart/form-data">
+<fieldset class="personalblock">
+	<legend><strong><?php echo $l->t('Bookmarklet <br />');?></strong></legend>
+	<?php
+			require_once 'bookmarklet.php';
+			createBookmarklet();
+	?>
+</fieldset>
+
+<form id="import_bookmark" action="<?php echo OCP\Util::linkTo( "bookmarks", "ajax/import.php" );?>" method="post" enctype="multipart/form-data">
 	<fieldset class="personalblock">
 		<?php if(isset($_['error'])): ?>
 			<h3><?php echo $_['error']['error']; ?></h3>
 			<p><?php echo $_['error']['hint']; ?></p>
 		<?php endif; ?>
 
-		<legend><strong><?php echo $l->t('Import bookmarks');?></strong></legend>
-		<p><input type="file" id="bm_import" name="bm_import" style="width:280px;">
-			<label for="bm_import"> <?php echo $l->t('Bookmark html file');?></label>
-		</p>
-		<input type="submit" name="bm_import" value="<?php echo $l->t('Import'); ?>" />
-
+			<legend><strong><?php echo $l->t('Import bookmarks');?></strong></legend>
+			<p><input type="file" id="bm_import" name="bm_import" style="width:280px;">
+				<label for="bm_import"> <?php echo $l->t('html bookmarks file');?></label>
+			</p>
+			<input type="button" name="bm_import_btn" id="bm_import_submit" value="<?php echo $l->t('Import'); ?>" />
+		<div id="upload"></div>
 
 		<legend><strong><?php echo $l->t('Export bookmarks');?></strong></legend>
 		<p><a href="<?php echo OCP\Util::linkTo('bookmarks', 'export.php') ;?>"