diff --git a/admin/class-gridable-admin.php b/admin/class-gridable-admin.php
index fe19431..2358fd6 100644
--- a/admin/class-gridable-admin.php
+++ b/admin/class-gridable-admin.php
@@ -71,6 +71,10 @@ function add_media_button( $editor_id ) {
 		 */
 		wp_enqueue_script( 'gridable-editor', plugin_dir_url( __FILE__ ) . 'js/admin-editor.js', array( 'jquery' ), $this->version, true );
 
+		wp_localize_script( 'gridable-editor', 'gridable_editor_params', array(
+			'new_column_content' => 'New column'
+		) );
+
 		global $editor_styles;
 		$editor_styles = array_merge( $editor_styles, array(
 			plugin_dir_url( __FILE__ ) . 'css/editor-style.css'
@@ -87,24 +91,19 @@ function wp_print_grider_tinymce_templates() {
 			'grid__item'
 		); ?>
 		<script type="text/html" id="tmpl-gridable-grider-row">
-			<div
-				class="{{data.classes}} <?php echo join( ' ', apply_filters( 'gridable_mce_sh_row_classes', $row_classes ) ); ?>"
-				{{data.atts}} data-gridable-row="1" data-mce-resize="false" data-mce-placeholder="1">
+			<div class="{{data.classes}} <?php echo join( ' ', apply_filters( 'gridable_mce_sh_row_classes', $row_classes ) ); ?>" {{data.atts}} data-gridable-row="1" data-mce-resize="false" data-mce-placeholder="1">
 				{{{data.content}}}
 			</div>
 		</script>
 
 		<script type="text/html" id="tmpl-gridable-grider-col">
-			<div
-				class="{{data.classes}} <?php echo join( ' ', apply_filters( 'gridable_mce_sh_col_classes', $col_classes ) ); ?>"
-				{{data.atts}} data-mce-resize="false" data-mce-placeholder="1">
+			<div class="{{data.classes}} <?php echo join( ' ', apply_filters( 'gridable_mce_sh_col_classes', $col_classes ) ); ?>" {{data.atts}} data-mce-resize="false" data-mce-placeholder="1">
 				<p>{{{data.content}}}</p>
 			</div>
 		</script>
 	<?php }
 
 	function add_grider_tinymce_plugin( $plugin_array ) {
-		$plugin_array['interact'] = plugin_dir_url( __FILE__ ) . 'js/interact.js';
 		$plugin_array['gridable'] = plugin_dir_url( __FILE__ ) . 'js/gridable.js';
 
 		return $plugin_array;
@@ -115,13 +114,12 @@ function my_add_styles_admin() {
 
 		if ( is_admin() ) { ?>
 			<script type="text/javascript">
-
 				var gridable_params = {
 					sh_col_classes: JSON.parse('<?php echo json_encode( apply_filters( 'gridable_sh_col_attr_size', array() ) ) ?>'),
 					l10n: JSON.parse('<?php echo json_encode( apply_filters( 'gridable_editor_l10n_labels', array(
-						'remove_row' => esc_html__( 'Remove Row', 'gridable' ),
-						'edit_row' => esc_html__( 'Edit Row', 'gridable' ),
-						'add_column' => esc_html__( 'Add Column', 'gridable' ),
+						'remove_row'         => esc_html__( 'Remove Row', 'gridable' ),
+						'edit_row'           => esc_html__( 'Edit Row', 'gridable' ),
+						'add_column'         => esc_html__( 'Add Column', 'gridable' ),
 						'new_column_content' => esc_html__( 'The new column', 'gridable' ),
 					) ) ) ?>')
 				};
diff --git a/admin/css/editor-style.css b/admin/css/editor-style.css
index e829c41..e1686f2 100644
--- a/admin/css/editor-style.css
+++ b/admin/css/editor-style.css
@@ -1,8 +1,6 @@
-.row.gridable-mceItem { background: #ebebeb; border-top: 1px solid #333; border-bottom: 1px solid #333; }
+.row.gridable-mceItem { background: #ebebeb; border: 1px dashed #bbb; padding: 5px; position: relative; }
 
-.col.gridable-mceItem { background: #e3e3e3; border-left: 1px solid #333; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; }
-
-.col.gridable-mceItem:last-child { border-right: 1px solid #333; }
+.col.gridable-mceItem { position: relative; background: #fefefe; border: 1px dashed #bbb; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; }
 
 [data-gridable-row] { display: -ms-flexbox; display: flex; -ms-flex-flow: row wrap; flex-flow: row wrap; }
 
diff --git a/admin/css/editor-style.css.map b/admin/css/editor-style.css.map
index bb3515d..bf28f1e 100644
--- a/admin/css/editor-style.css.map
+++ b/admin/css/editor-style.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAA,qBAAsB,GACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,cAAc,EAC1B,aAAa,EAAE,cAAc;;AAG9B,qBAAsB,GACrB,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,cAAc,EAE3B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,UAAU,EAC3B,kBAAkB,EAAE,UAAU;;AAG/B,gCAAiC,GAChC,YAAY,EAAE,cAAc;;AAI7B,mBAAoB,GACnB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,QAAQ;;AAGpB,uBAAwB,GACvB,IAAI,EAAE,QAAQ;;AAId,2BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,2BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,2BAAoC,GACnC,UAAU,EAAE,GACb;;AAFA,2BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,4BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,4BAAoC,GACnC,UAAU,EAAE,IACb;;AAGD,uBAAwB,GACvB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,IAAI",
+"mappings": "AAAA,qBAAsB,GACrB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,QAAQ;;AAGnB,qBAAsB,GACrB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,eAAe,EAEvB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,UAAU,EAC3B,kBAAkB,EAAE,UAAU;;AAI/B,mBAAoB,GACnB,OAAO,EAAE,IAAI,EACb,SAAS,EAAE,QAAQ;;AAGpB,uBAAwB,GACvB,IAAI,EAAE,QAAQ;;AAId,2BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,2BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,2BAAoC,GACnC,UAAU,EAAE,GACb;;AAFA,2BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,4BAAoC,GACnC,UAAU,EAAE,SACb;;AAFA,4BAAoC,GACnC,UAAU,EAAE,IACb;;AAGD,uBAAwB,GACvB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,IAAI,EAChB,OAAO,EAAE,IAAI",
 "sources": ["../editor-style.scss"],
 "names": [],
 "file": "editor-style.css"
diff --git a/admin/icons/icon.png b/admin/icons/icon.png
new file mode 100644
index 0000000..ec66b73
Binary files /dev/null and b/admin/icons/icon.png differ
diff --git a/admin/js/admin-editor.js b/admin/js/admin-editor.js
index b7f9e18..78b9d6a 100644
--- a/admin/js/admin-editor.js
+++ b/admin/js/admin-editor.js
@@ -7,21 +7,24 @@
 
 		var shortcode = '<p>[row cols_nr="1"]</p>';
 
-		shortcode += '<p>[col size="12"]</p><p>Our dining atmosphere is casual and comfortable.</p><p>[/col]</p>';
+		shortcode += '<p>[col size="12"]</p><p>' + gridable_editor_params.new_column_content + '</p><p>[/col]</p>';
 
-		shortcode += '<p>[/row]</p>';
+		shortcode += '<p>[/row]</p><p></p><p></p>';
 
-		console.log(shortcode);
-		shortcode = wpAutoP( shortcode );
-		console.log(shortcode);
 		wp.media.editor.insert( shortcode );
+
+		clearfix();
 	});
 
-	var wpAutoP = function ( content ) {
-		if ( switchEditors && switchEditors.wpautop ) {
-			content = switchEditors.wpautop(content);
-		}
-		return content;
+	var clearfix = function (  ) {
+		// if ( switchEditors && switchEditors.wpautop ) {
+		// 	content = switchEditors.wpautop(content);
+		// }
+		// return content;
+
+
+		switchEditors.go( 'content', 'html' );
+		switchEditors.go( 'content', 'tmce' );
 	};
 
 })( jQuery );
\ No newline at end of file
diff --git a/admin/js/gridable.js b/admin/js/gridable.js
index b6f8718..42746d8 100644
--- a/admin/js/gridable.js
+++ b/admin/js/gridable.js
@@ -1,6 +1,6 @@
 (function () {
 	/**
-	 *
+	 * A TinyMCE plugin which handles the rendering of grid shortcodes
 	 */
 	tinymce.PluginManager.add('gridable', function ( editor, url ) {
 
@@ -10,26 +10,6 @@
 		var toolbar,
 			l10n = gridable_params.l10n;
 
-
-		function dragMoveListener( event ) {
-			var target = event.target,
-				// keep the dragged position in the data-x/data-y attributes
-				x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
-				y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
-
-			// translate the element
-			target.style.webkitTransform =
-				target.style.transform =
-					'translate(' + x + 'px, ' + y + 'px)';
-
-			// update the posiion attributes
-			target.setAttribute('data-x', x);
-			target.setAttribute('data-y', y);
-		}
-
-		// this is used later in the resizing and gesture demos
-		window.dragMoveListener = dragMoveListener;
-
 		// the bix X button that removes the entre row shortcode
 		editor.addButton('gridable_row_remove', {
 			tooltip: l10n.remove_row,
@@ -109,30 +89,7 @@
 				node = editor.dom.create('DIV', {}, tmp);
 
 				wrap[0].appendChild(node.children[0]);
-
-				// target elements with the "draggable" class
-				interact( columns[0] )
-					.origin('self')
-					.resizable({
-						onmove: function ( e ) {
-							console.log(e);
-						},
-						// max          : Number,
-						// maxPerElement: Number,
-						// manualStart  : Boolean,
-						// snap         : {/* ... */},
-						// restrict     : {/* ... */},
-						// inertia      : {/* ... */},
-						// autoScroll   : {/* ... */},
-						//
-						// square       : true || false,
-						edges: {
-							top   : false,       // Use pointer coords to check for resize.
-							left  : true,      // Disable resizing from left edge.
-							bottom: false,// Resize if pointer target matches selector
-							right : true    // Resize if pointer target is the given Element
-						}
-					});
+				clearfix();
 			}
 		});
 
@@ -140,7 +97,7 @@
 			if ( editor.wp && editor.wp._createToolbar ) {
 				toolbar = editor.wp._createToolbar([
 					'gridable_add_col',
-					'gridable_edit_row',
+					// 'gridable_edit_row',
 					'gridable_row_remove'
 				]);
 			}
@@ -160,9 +117,11 @@
 			}
 		});
 
-
 		function replaceShortcodes( content ) {
 
+			// first remove s
+			content = removeAutoP(content);
+
 			var new_content = wp.shortcode.replace('row', content, function ( args ) {
 				return getRowTemplate(args);
 			});
@@ -171,9 +130,19 @@
 				return getColTemplate(args);
 			});
 
+			new_content = wpAutoP( new_content );
+
 			return new_content;
 		}
 
+		/**
+		 * This function must restore the shortcodes from the rendering state
+		 *
+		 * Since we are handling html we rather create a DOM element and use its innerHTML as parsing method
+		 *
+		 * @param content
+		 * @returns {*|string}
+		 */
 		function restoreShortcodes( content ) {
 
 			if ( typeof( window.QTags ) !== 'undefined' ) {
@@ -181,26 +150,8 @@
 			}
 
 			var div = document.createElement('div');
-
 			div.innerHTML = content;
 
-			// first restore back the row shortcodes
-			var rows = div.querySelectorAll('.row.gridable-mceItem'),
-				to_replaceR = '';
-
-			for ( var indexR = 0; indexR < rows.length; indexR++ ) {
-
-				var row_atts = '';
-
-				if ( typeof rows[indexR].getAttribute('data-sh-attr-cols_nr') !== "null" ) {
-					row_atts += ' cols_nr="' + rows[indexR].getAttribute('data-sh-attr-cols_nr') + '"';
-				}
-
-				to_replaceR = '<p>[row' + row_atts + ']</p>' + rows[indexR].innerHTML + '<p>[/row]</p>';
-
-				content = content.replace(rows[indexR].outerHTML, to_replaceR);
-			}
-
 			var cols = div.querySelectorAll('.col.gridable-mceItem'),
 				to_replaceC = '';
 
@@ -213,27 +164,120 @@
 				}
 
 				to_replaceC = '<p>[col' + col_atts + ']</p><p>' + cols[indexC].innerHTML + '</p><p>[/col]</p>';
+				div.innerHTML = div.innerHTML.replace( cols[indexC].outerHTML , to_replaceC);
+			}
+
+			// first restore back the row shortcodes
+			var rows = div.querySelectorAll('.row.gridable-mceItem'),
+				to_replaceR = '';
+
+			for ( var indexR = 0; indexR < rows.length; indexR++ ) {
+
+				var row_atts = '';
+
+				if ( typeof rows[indexR].getAttribute('data-sh-row-attr-cols_nr') !== "null" ) {
+					row_atts += ' cols_nr="' + rows[indexR].getAttribute('data-sh-row-attr-cols_nr') + '"';
+				}
 
-				content = content.replace(cols[indexC].outerHTML, to_replaceC);
+				to_replaceR = '<p>[row' + row_atts + ']</p>' + rows[indexR].innerHTML + '<p>[/row]</p>';
+
+				div.innerHTML = div.innerHTML.replace(rows[indexR].outerHTML, to_replaceR);
 			}
 
-			return content;
+			return div.innerHTML;
 		}
 
 		editor.on('BeforeSetContent', function ( event ) {
-			event.content = removeAutoP(event.content);
 			event.content = replaceShortcodes(event.content);
-			event.content = wpAutoP(event.content);
 		});
 
+
+		//
+		// editor.on('SetContent', function ( event ) {
+		//
+		// 	var startMovingTheControl = function ( e ) {
+		// 		console.log( 'moving now' );
+		// 		// var new_left = parseInt( e.target.style.left.replace('px', '') ) + e.movementX;
+		// 		// e.target.setAttribute('style', 'left: ' + new_left + 'px;' );
+		// 	};
+		//
+		// 	var gridableControlOnMouseDown = function ( e ) {
+		// 		e.target.parentElement.style.pointerEvents = false;
+		//
+		// 		if ( e.target.className.indexOf('resize_control') > -1 ) {
+		// 			// console.log( 'down');
+		// 			e.target.addEventListener('mousemove', startMovingTheControl );
+		// 		}
+		// 	};
+		//
+		// 	var gridableControlOnMouseUp = function ( e ) {
+		// 		e.target.removeEventListener('mousemove', startMovingTheControl );
+		// 		console.log('remove moving');
+		// 	};
+		//
+		// 	var gridableControlOnMouseOut = function ( ev ) {
+		// 		console.log('remove moving');
+		// 		// console.log('out the FUCK!!!!! of the element');
+		//
+		// 		ev.target.removeEventListener('mousemove', startMovingTheControl );
+		//
+		// 		//this is the original element the event handler was assigned to
+		// 		var e = ev.toElement || ev.relatedTarget;
+		// 		if (e.parentNode == this || e == this) {
+		// 			return;
+		// 		}
+		//
+		// 	};
+		//
+		// 	setTimeout( function (  ) {
+		//
+		// 		var columns = editor.$('.col.gridable-mceItem');
+		//
+		// 		// make each col resizable
+		// 		columns.each(function ( i, column ) {
+		//
+		// 			if ( i < columns.length - 1 ) {
+		//
+		// 				var control_span = document.createElement('span');
+		// 				control_span.classList.add('resize_control');
+		// 				control_span.setAttribute('contenteditable', false );
+		// 				control_span.setAttribute('draggable', true );
+		//
+		// 				var ps = column.getBoundingClientRect();
+		// 				var new_left = ps.width - 5;
+		//
+		// 				// control_span.setAttribute('style', 'left: ' + new_left + 'px;' );
+		// 				control_span.style.left = new_left + 'px';
+		// 				// column.appendChild( control_span );
+		// 				column.parentNode.insertBefore(control_span, column.nextSibling);
+		//
+		// 				editor.dom.bind( control_span, 'mousedown', gridableControlOnMouseDown);
+		// 				editor.dom.bind( control_span, 'mouseup', gridableControlOnMouseUp);
+		// 				// editor.dom.bind( control_span, 'mouseout', gridableControlOnMouseOut);
+		// 			}
+		// 		});
+		// 	}, 600 );
+		// });
+
+		//
+		// editor.on('ObjectResized', function ( e ) {
+		// 	console.log('this was a resize');
+		// });
+		//
+		// editor.on('ObjectSelected', function ( e ) {
+		// 	console.log('this is a resize');
+		// });
+
 		editor.on('PostProcess', function ( event ) {
 			if ( event.content ) {
 				event.content = restoreShortcodes(event.content);
+				// clearfix();
 			}
 		});
 
 		//helper functions
 		function getRowTemplate( args ) {
+
 			var rowSh = wp.template("gridable-grider-row"),
 				atts = get_attrs_string('row', args);
 
@@ -258,6 +302,7 @@
 		/**
 		 * First get all the attributes and save them from cols_nr="4" into `data-attr-sh-cols_nr="4"`
 		 *
+		 * @param tag
 		 * @param atts
 		 * @returns {string}
 		 */
@@ -294,5 +339,16 @@
 			}
 			return content;
 		};
+
+		var clearfix = function (  ) {
+			// if ( switchEditors && switchEditors.wpautop ) {
+			// 	content = switchEditors.wpautop(content);
+			// }
+			// return content;
+
+
+			switchEditors.go( 'content', 'html' );
+			switchEditors.go( 'content', 'tmce' );
+		};
 	});
 })();
\ No newline at end of file
diff --git a/admin/scss/editor-style.scss b/admin/scss/editor-style.scss
index 0a3c3c3..741b55b 100644
--- a/admin/scss/editor-style.scss
+++ b/admin/scss/editor-style.scss
@@ -1,21 +1,19 @@
 .row.gridable-mceItem {
 	background: #ebebeb;
-	border-top: 1px solid #333;
-	border-bottom: 1px solid #333;
+	border: 1px dashed #bbb;
+	padding: 5px;
+	position: relative;
 }
 
 .col.gridable-mceItem {
-	background: #e3e3e3;
-	border-left: 1px solid #333;
+	position: relative;
+	background: #fefefe;
+	border: 1px dashed #bbb;
 
 	box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 }
-
-.col.gridable-mceItem:last-child {
-	border-right: 1px solid #333;
-}
 // The Grid
 
 [data-gridable-row] {
@@ -38,3 +36,26 @@
 	background: #EEE;
 	padding: 10px;
 }
+
+//.resize_control {
+//	background: #fff;
+//	border: 0;
+//	outline: 0 !important;
+//	cursor: col-resize !important;
+//
+//	display: block;
+//
+//	width: 18px;
+//	height: auto;
+//
+//	top: 5px;
+//	bottom: 5px;
+//
+//	position: absolute;
+//
+//	z-index: 50;
+//	background: url("../icons/icon.png");
+//	background-repeat: no-repeat;
+//	background-position: 0;
+//	background-size: contain;
+//}
\ No newline at end of file