diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
index 90df21f..3c66b20 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
@@ -71,6 +71,8 @@ Clipperz.PM.UI.Components.Cards.EditClass = React.createClass({
 //		anEvent.dataTransfer.setDragImage(anEvent.currentTarget, x, y);
 		anEvent.dataTransfer.setDragImage(dragElement, x, y);
 
+		anEvent.dataTransfer.setData('Text', ""); // Firefox wants this to be defined
+
 		MochiKit.Async.callLater(0.1, MochiKit.Base.bind(this.setState, this, {
 			'draggedFieldReference': fieldReference,
 			'fromFieldPosition': fieldPosition,
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js
index 2976c1b..37b3e3a 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js
@@ -76,7 +76,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.DeleteAccountClass = React.createClass({
 	render: function () {
 		return	React.DOM.div({className:'extraFeature deleteAccount'}, [
 			React.DOM.div({'className':'header'}, [
-				React.DOM.h1({}, "Delete Account"),
+				React.DOM.h1({}, "Delete account"),
 			]),
 			React.DOM.div({'className': 'content'}, [
 				React.DOM.form({'key':'form', 'className':'deleteAccountForm', 'onChange': this.handleFormChange, 'onSubmit':this.handleDeleteAccount}, [
@@ -87,7 +87,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.DeleteAccountClass = React.createClass({
 						React.DOM.input({'key':'passphrase', 'className': this.state['passphrase'], 'type':'password', 'name':'passphrase', 'ref':'passphrase', 'placeholder':"passphrase"}),
 						React.DOM.p({}, [
 							React.DOM.input({'key':'confirm', 'className':'confirmCheckbox', 'type':'checkbox', 'id':'deleteAccountConfirmCheckbox', 'name':'confirm', 'ref':'confirm'}),
-							React.DOM.label({'htmlFor':'deleteAccountConfirmCheckbox'}, "I understand that all my data will be deleted and that this action is not reversible.")
+							React.DOM.label({'htmlFor':'deleteAccountConfirmCheckbox'}, "All my data will be permanently deleted. I understand that this action cannot be undone or cancelled.")
 						]),
 					]),
 					React.DOM.button({'key':'button', 'type':'submit', 'disabled':!this.shouldEnableDeleteAccountButton(), 'className':'button'}, "Delete my account")
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js
index cb63f21..ad76586 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js
@@ -217,7 +217,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({
 			React.DOM.div({'className':'header'}, [
 				React.DOM.h1({}, "One-Time Passwords"),
 				React.DOM.div({'className':'description'}, [
-					React.DOM.p({}, "A one-time password works like your regular passphrase, but can be used only once. This makes it expecially useful for using it in places where keyloggers may be installed."),
+					React.DOM.p({}, "A one-time password works like your regular passphrase, but it can be used only once. Strongly recommended when accessing your Clipperz account from unsecure devices where keyloggers may be installed."),
 				]),
 				React.DOM.a({'className':'button', 'onClick':this.handlePrint}, "Print")
 			]),
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/Passphrase.js b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/Passphrase.js
index 53fa2db..4ed282b 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/Passphrase.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/Passphrase.js
@@ -101,7 +101,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.PassphraseClass = React.createClass({
 	render: function () {
 		return	React.DOM.div({className:'extraFeature passphrase'}, [
 			React.DOM.div({'className':'header'}, [
-				React.DOM.h1({}, "Change Passphrase"),
+				React.DOM.h1({}, "Change passphrase"),
 			]),
 			React.DOM.div({'className': 'content'}, [
 				React.DOM.form({'key':'form', 'className':'changePassphraseForm', 'onChange': this.handleFormChange, 'onSubmit':this.handleChangePassphrase}, [
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
index 6695616..89353e0 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
@@ -149,10 +149,10 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
 		var refName = MochiKit.Base.filter(function (aRefName) { return refs[aRefName].getDOMNode() == anEvent.target}, MochiKit.Base.keys(this.refs))[0];
 		var newState = {};
 
-		if ((event.target.type == 'checkbox') || (event.target.type == 'radio')) {
-			newState[refName] = event.target.checked;
+		if ((anEvent.target.type == 'checkbox') || (anEvent.target.type == 'radio')) {
+			newState[refName] = anEvent.target.checked;
 		} else {
-			newState[refName] = event.target.value;
+			newState[refName] = anEvent.target.value;
 		}
 	    this.setState(newState);
 	},
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js b/frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js
index f431251..fdadb1d 100644
--- a/frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js
+++ b/frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js
@@ -107,7 +107,8 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
 		this.setState({
 			'isFullyOpen': false,
 			'extraFeatureComponentName': null,
-			'extraFeatureContent': null
+			'extraFeatureContent': null,
+			'extraFeatureContentComponent': null
 		});
 	},
 
diff --git a/frontend/delta/js/Clipperz/PM/UI/MainController.js b/frontend/delta/js/Clipperz/PM/UI/MainController.js
index 375af70..18dd300 100644
--- a/frontend/delta/js/Clipperz/PM/UI/MainController.js
+++ b/frontend/delta/js/Clipperz/PM/UI/MainController.js
@@ -1456,7 +1456,7 @@ console.log("THE BROWSER IS OFFLINE");
 //function (aValue) { console.log("2- USER.hasPendingChanges()", aValue); return aValue; },
 			Clipperz.Async.deferredIf('HasPendingChanges',[
 				MochiKit.Base.method(self, 'ask', {
-					'question': "Lose pending changes?",
+					'question': "There are pending changes to your card. Ignore changes?",
 					'possibleAnswers':{
 						'cancel':	{'label':"No",	'isDefault':true,	'answer':MochiKit.Base.methodcaller('cancel', new MochiKit.Async.CancelledError())},
 						'revert':	{'label':"Yes",	'isDefault':false,	'answer':MochiKit.Base.methodcaller('callback')}