diff --git a/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js b/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js
index fe47521..484e936 100644
--- a/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js
+++ b/skyquake/plugins/composer/src/src/components/CatalogItemDetailsEditor.js
@@ -72,9 +72,4 @@
 
 	}
 });
-
-CatalogItemDetailsEditor.contextTypes = {
-    router: React.PropTypes.object,
-    userProfile: React.PropTypes.object
-};
 export default CatalogItemDetailsEditor;
diff --git a/skyquake/plugins/composer/src/src/components/DetailsPanel.js b/skyquake/plugins/composer/src/src/components/DetailsPanel.js
index 7af2ad1..37fc17b 100644
--- a/skyquake/plugins/composer/src/src/components/DetailsPanel.js
+++ b/skyquake/plugins/composer/src/src/components/DetailsPanel.js
@@ -50,6 +50,10 @@
 	},
 	componentWillUnmount() {
 	},
+	contextTypes: {
+	    router: React.PropTypes.object,
+	    userProfile: React.PropTypes.object
+	},
 	render() {
 		let json = '{}';
 		let bodyComponent =  messages.detailsWelcome();
@@ -73,9 +77,4 @@
 	}
 });
 
-DetailsPanel.contextTypes = {
-    router: React.PropTypes.object,
-    userProfile: React.PropTypes.object
-};
-
 export default DetailsPanel;
diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index e75f3cd..65712f4 100644
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -75,6 +75,8 @@
 
 	const container = props.container;
 	const readonly = props.readonly;
+	const isEditable = !readonly; //true
+
 	if (!(DescriptorModelFactory.isContainer(container))) {
 		return
 	}
@@ -184,7 +186,6 @@
 		let catalogs = cds.getTransientCatalogs();
 
 		const name = path.join('.');
-		const isEditable = !readonly; //true
 		const isGuid = Property.isGuid(property);
 		const isBoolean = Property.isBoolean(property);
 		const onChange = onFormFieldValueChanged.bind(container);