diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 88980719f8..e87945e813 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -91,7 +91,10 @@ else
 <p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
 <p>
 <select name='post_status' id='post_status' tabindex='4'>
-<?php if ( current_user_can('publish_posts') ) : // Contributors only get "Unpublished" and "Pending Review" ?>
+<?php 
+// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) 
+if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) :
+?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
 <?php if ( 'future' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index e8f0dc4612..c05ba6e1c0 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -57,12 +57,19 @@ function _wp_translate_postdata( $update = false ) {
 	if ( isset($_POST['advanced']) && '' != $_POST['advanced'] )
 		$_POST['post_status'] = 'draft';
 
+	$previous_status = get_post_field('post_status',  $_POST['ID']);
+
+	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. 
+	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
 	if ( 'page' == $_POST['post_type'] ) {
 		if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) )
 			$_POST['post_status'] = 'pending';
 	} else {
-		if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) )
-			$_POST['post_status'] = 'pending';
+		if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) ) :
+			// Stop attempts to publish new posts, but allow already published posts to be saved if appropriate.
+			if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_posts') )
+				$_POST['post_status'] = 'pending';
+		endif;
 	}
 
 	if (!isset( $_POST['comment_status'] ))
diff --git a/wp-includes/js/jquery/ui.core.js b/wp-includes/js/jquery/ui.core.js
index 0d7a26d0d0..5fabd9ae85 100644
--- a/wp-includes/js/jquery/ui.core.js
+++ b/wp-includes/js/jquery/ui.core.js
@@ -7,235 +7,271 @@
  *
  * http://docs.jquery.com/UI
  *
- * $Id: ui.core.js 5634 2008-05-19 20:53:51Z joern.zaefferer $
+ * $Id: ui.core.js 5587 2008-05-13 19:56:42Z scott.gonzalez $
  */
 ;(function($) {
-	
-	$.ui = {
-		plugin: {
-			add: function(module, option, set) {
-				var proto = $.ui[module].prototype;
-				for(var i in set) {
-					proto.plugins[i] = proto.plugins[i] || [];
-					proto.plugins[i].push([option, set[i]]);
-				}
-			},
-			call: function(instance, name, args) {
-				var set = instance.plugins[name];
-				if(!set) { return; }
-				
-				for (var i = 0; i < set.length; i++) {
-					if (instance.options[set[i][0]]) {
-						set[i][1].apply(instance.element, args);
-					}
-				}
-			}	
+
+$.ui = {
+	plugin: {
+		add: function(module, option, set) {
+			var proto = $.ui[module].prototype;
+			for(var i in set) {
+				proto.plugins[i] = proto.plugins[i] || [];
+				proto.plugins[i].push([option, set[i]]);
+			}
 		},
-		cssCache: {},
-		css: function(name) {
-			if ($.ui.cssCache[name]) { return $.ui.cssCache[name]; }
-			var tmp = $('<div class="ui-resizable-gen">').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body');
+		call: function(instance, name, args) {
+			var set = instance.plugins[name];
+			if(!set) { return; }
 			
-			//if (!$.browser.safari)
-				//tmp.appendTo('body'); 
-			
-			//Opera and Safari set width and height to 0px instead of auto
-			//Safari returns rgba(0,0,0,0) when bgcolor is not set
-			$.ui.cssCache[name] = !!(
-				(!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || 
-				!(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba\(0, 0, 0, 0\)/).test(tmp.css('backgroundColor')))
-			);
-			try { $('body').get(0).removeChild(tmp.get(0));	} catch(e){}
-			return $.ui.cssCache[name];
-		},
-		disableSelection: function(e) {
-			e.unselectable = "on";
-			e.onselectstart = function() { return false; };
-			if (e.style) { e.style.MozUserSelect = "none"; }
-		},
-		enableSelection: function(e) {
-			e.unselectable = "off";
-			e.onselectstart = function() { return true; };
-			if (e.style) { e.style.MozUserSelect = ""; }
-		},
-		hasScroll: function(e, a) {
-			var scroll = /top/.test(a||"top") ? 'scrollTop' : 'scrollLeft', has = false;
-			if (e[scroll] > 0) return true; e[scroll] = 1;
-			has = e[scroll] > 0 ? true : false; e[scroll] = 0;
-			return has;
-		}
-	};
-	
-	
-	/** jQuery core modifications and additions **/
-	
-	var _remove = $.fn.remove;
-	$.fn.remove = function() {
-		$("*", this).add(this).trigger("remove");
-		return _remove.apply(this, arguments );
-	};
-	
-	// $.widget is a factory to create jQuery plugins
-	// taking some boilerplate code out of the plugin code
-	// created by Scott González and Jörn Zaefferer
-	function getter(namespace, plugin, method) {
-		var methods = $[namespace][plugin].getter || [];
-		methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods);
-		return ($.inArray(method, methods) != -1);
+			for (var i = 0; i < set.length; i++) {
+				if (instance.options[set[i][0]]) {
+					set[i][1].apply(instance.element, args);
+				}
+			}
+		}	
+	},
+	cssCache: {},
+	css: function(name) {
+		if ($.ui.cssCache[name]) { return $.ui.cssCache[name]; }
+		var tmp = $('<div class="ui-resizable-gen">').addClass(name).css({position:'absolute', top:'-5000px', left:'-5000px', display:'block'}).appendTo('body');
+		
+		//if (!$.browser.safari)
+			//tmp.appendTo('body'); 
+		
+		//Opera and Safari set width and height to 0px instead of auto
+		//Safari returns rgba(0,0,0,0) when bgcolor is not set
+		$.ui.cssCache[name] = !!(
+			(!(/auto|default/).test(tmp.css('cursor')) || (/^[1-9]/).test(tmp.css('height')) || (/^[1-9]/).test(tmp.css('width')) || 
+			!(/none/).test(tmp.css('backgroundImage')) || !(/transparent|rgba\(0, 0, 0, 0\)/).test(tmp.css('backgroundColor')))
+		);
+		try { $('body').get(0).removeChild(tmp.get(0));	} catch(e){}
+		return $.ui.cssCache[name];
+	},
+	disableSelection: function(e) {
+		e.unselectable = "on";
+		e.onselectstart = function() { return false; };
+		if (e.style) { e.style.MozUserSelect = "none"; }
+	},
+	enableSelection: function(e) {
+		e.unselectable = "off";
+		e.onselectstart = function() { return true; };
+		if (e.style) { e.style.MozUserSelect = ""; }
+	},
+	hasScroll: function(e, a) {
+		var scroll = /top/.test(a||"top") ? 'scrollTop' : 'scrollLeft', has = false;
+		if (e[scroll] > 0) return true; e[scroll] = 1;
+		has = e[scroll] > 0 ? true : false; e[scroll] = 0;
+		return has;
 	}
+};
+
+
+/** jQuery core modifications and additions **/
+
+var _remove = $.fn.remove;
+$.fn.remove = function() {
+	$("*", this).add(this).trigger("remove");
+	return _remove.apply(this, arguments );
+};
+
+// $.widget is a factory to create jQuery plugins
+// taking some boilerplate code out of the plugin code
+// created by Scott González and Jörn Zaefferer
+function getter(namespace, plugin, method) {
+	var methods = $[namespace][plugin].getter || [];
+	methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods);
+	return ($.inArray(method, methods) != -1);
+}
+
+var widgetPrototype = {
+	init: function() {},
+	destroy: function() {
+		this.element.removeData(this.widgetName);
+	},
 	
-	var widgetPrototype = {
-		init: function() {},
-		destroy: function() {
-			this.element.removeData(this.widgetName);
-		},
+	getData: function(key) {
+		return this.options[key];
+	},
+	setData: function(key, value) {
+		this.options[key] = value;
+	},
+	
+	enable: function() {
+		this.setData('disabled', false);
+	},
+	disable: function() {
+		this.setData('disabled', true);
+	}
+};
+
+$.widget = function(name, prototype) {
+	var namespace = name.split(".")[0];
+	name = name.split(".")[1];
+	// create plugin method
+	$.fn[name] = function(options) {
+		var isMethodCall = (typeof options == 'string'),
+			args = Array.prototype.slice.call(arguments, 1);
 		
-		getData: function(key) {
-			return this.options[key];
-		},
-		setData: function(key, value) {
-			this.options[key] = value;
-		},
-		
-		enable: function() {
-			this.setData('disabled', false);
-		},
-		disable: function() {
-			this.setData('disabled', true);
+		if (isMethodCall && getter(namespace, name, options)) {
+			var instance = $.data(this[0], name);
+			return (instance ? instance[options].apply(instance, args)
+				: undefined);
 		}
+		
+		return this.each(function() {
+			var instance = $.data(this, name);
+			if (!instance) {
+				$.data(this, name, new $[namespace][name](this, options));
+			} else if (isMethodCall) {
+				instance[options].apply(instance, args);
+			}
+		});
 	};
 	
-	$.widget = function(name, prototype) {
-		var namespace = name.split(".")[0];
-		name = name.split(".")[1];
-		// create plugin method
-		$.fn[name] = function(options) {
-			var isMethodCall = (typeof options == 'string'),
-				args = Array.prototype.slice.call(arguments, 1);
-			
-			if (isMethodCall && getter(namespace, name, options)) {
-				var instance = $.data(this[0], name);
-				return (instance ? instance[options].apply(instance, args)
-					: undefined);
-			}
-			
-			return this.each(function() {
-				var instance = $.data(this, name);
-				if (!instance) {
-					$.data(this, name, new $[namespace][name](this, options));
-				} else if (isMethodCall) {
-					instance[options].apply(instance, args);
-				}
+	// create widget constructor
+	$[namespace][name] = function(element, options) {
+		var self = this;
+		
+		this.widgetName = name;
+		
+		this.options = $.extend({}, $[namespace][name].defaults, options);
+		this.element = $(element)
+			.bind('setData.' + name, function(e, key, value) {
+				return self.setData(key, value);
+			})
+			.bind('getData.' + name, function(e, key) {
+				return self.getData(key);
+			})
+			.bind('remove', function() {
+				return self.destroy();
 			});
-		};
-		
-		// create widget constructor
-		$[namespace][name] = function(element, options) {
-			var self = this;
-			
-			this.widgetName = name;
-			
-			this.options = $.extend({}, $[namespace][name].defaults, options);
-			this.element = $(element)
-				.bind('setData.' + name, function(e, key, value) {
-					return self.setData(key, value);
-				})
-				.bind('getData.' + name, function(e, key) {
-					return self.getData(key);
-				})
-				.bind('remove', function() {
-					return self.destroy();
-				});
-			this.init();
-		};
-		
-		// add widget prototype
-		$[namespace][name].prototype = $.extend({}, widgetPrototype, prototype);
+		this.init();
 	};
 	
+	// add widget prototype
+	$[namespace][name].prototype = $.extend({}, widgetPrototype, prototype);
+};
+
+
+/** Mouse Interaction Plugin **/
+
+$.ui.mouse = {
+	mouseInit: function() {
+		var self = this;
 	
-	/** Mouse Interaction Plugin **/
-	
-	$.widget("ui.mouse", {
-		init: function() {
-			var self = this;
-			
-			this.element
-				.bind('mousedown.mouse', function() { return self.click.apply(self, arguments); })
-				.bind('mouseup.mouse', function() { (self.timer && clearTimeout(self.timer)); })
-				.bind('click.mouse', function() { if(self.initialized) { self.initialized = false; return false; } });
-			//Prevent text selection in IE
-			if ($.browser.msie) {
-				this.unselectable = this.element.attr('unselectable');
-				this.element.attr('unselectable', 'on');
-			}
-		},
-		destroy: function() {
-			this.element.unbind('.mouse').removeData("mouse");
-			($.browser.msie && this.element.attr('unselectable', this.unselectable));
-		},
-		trigger: function() { return this.click.apply(this, arguments); },
-		click: function(e) {
+		this.element.bind('mousedown.'+this.widgetName, function(e) {
+			return self.mouseDown(e);
+		});
 		
-			if(    e.which != 1 //only left click starts dragging
-				|| $.inArray(e.target.nodeName.toLowerCase(), this.options.dragPrevention || []) != -1 // Prevent execution on defined elements
-				|| (this.options.condition && !this.options.condition.apply(this.options.executor || this, [e, this.element])) //Prevent execution on condition
-			) { return true; }
-		
-			var self = this;
-			this.initialized = false;
-			var initialize = function() {
-				self._MP = { left: e.pageX, top: e.pageY }; // Store the click mouse position
-				$(document).bind('mouseup.mouse', function() { return self.stop.apply(self, arguments); });
-				$(document).bind('mousemove.mouse', function() { return self.drag.apply(self, arguments); });
-		
-				if(!self.initalized && Math.abs(self._MP.left-e.pageX) >= self.options.distance || Math.abs(self._MP.top-e.pageY) >= self.options.distance) {
-					(self.options.start && self.options.start.call(self.options.executor || self, e, self.element));
-					(self.options.drag && self.options.drag.call(self.options.executor || self, e, this.element)); //This is actually not correct, but expected
-					self.initialized = true;
-				}
-			};
-
-			if(this.options.delay) {
-				if(this.timer) { clearTimeout(this.timer); }
-				this.timer = setTimeout(initialize, this.options.delay);
-			} else {
-				initialize();
-			}
-				
-			return false;
-			
-		},
-		stop: function(e) {
-			
-			if(!this.initialized) {
-				return $(document).unbind('mouseup.mouse').unbind('mousemove.mouse');
-			}
-
-			(this.options.stop && this.options.stop.call(this.options.executor || this, e, this.element));
-			
-			$(document).unbind('mouseup.mouse').unbind('mousemove.mouse');
-			return false;
-			
-		},
-		drag: function(e) {
-
-			var o = this.options;
-			if ($.browser.msie && !e.button) {
-				return this.stop.call(this, e); // IE mouseup check
-			}
-			
-			if(!this.initialized && (Math.abs(this._MP.left-e.pageX) >= o.distance || Math.abs(this._MP.top-e.pageY) >= o.distance)) {
-				(o.start && o.start.call(o.executor || this, e, this.element));
-				this.initialized = true;
-			} else {
-				if(!this.initialized) { return false; }
-			}
-
-			(o.drag && o.drag.call(this.options.executor || this, e, this.element));
-			return false;
-			
+		// Prevent text selection in IE
+		if ($.browser.msie) {
+			this._mouseUnselectable = this.element.attr('unselectable');
+			this.element.attr('unselectable', 'on');
 		}
-	});
+		
+		this.started = false;
+	},
 	
-})(jQuery);
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	mouseDestroy: function() {
+		this.element.unbind('.'+this.widgetName);
+		
+		// Restore text selection in IE
+		($.browser.msie
+			&& this.element.attr('unselectable', this._mouseUnselectable));
+	},
+	
+	mouseDown: function(e) {
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this.mouseUp(e));
+		
+		this._mouseDownEvent = e;
+		
+		var self = this,
+			btnIsLeft = (e.which == 1),
+			elIsCancel = ($(e.target).is(this.options.cancel));
+		if (!btnIsLeft || elIsCancel) {
+			return true;
+		}
+		
+		this._mouseDelayMet = !this.options.delay;
+		if (!this._mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				self._mouseDelayMet = true;
+			}, this.options.delay);
+		}
+		
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(e) {
+			return self.mouseMove(e);
+		};
+		this._mouseUpDelegate = function(e) {
+			return self.mouseUp(e);
+		};
+		$(document)
+			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+		
+		return false;
+	},
+	
+	mouseMove: function(e) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.browser.msie && !e.button) {
+			return this.mouseUp(e);
+		}
+		
+		if (this._mouseStarted) {
+			this.mouseDrag(e);
+			return false;
+		}
+		
+		if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
+			this._mouseStarted =
+				(this.mouseStart(this._mouseDownEvent, e) !== false);
+			(this._mouseStarted || this.mouseUp(e));
+		}
+		
+		return !this._mouseStarted;
+	},
+	
+	mouseUp: function(e) {
+		$(document)
+			.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
+			.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
+		
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+			this.mouseStop(e);
+		}
+		
+		return false;
+	},
+	
+	mouseDistanceMet: function(e) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - e.pageX),
+				Math.abs(this._mouseDownEvent.pageY - e.pageY)
+			) >= this.options.distance
+		);
+	},
+	
+	mouseDelayMet: function(e) {
+		return this._mouseDelayMet;
+	},
+	
+	// These are placeholder methods, to be overriden by extending plugin
+	mouseStart: function(e) {},
+	mouseDrag: function(e) {},
+	mouseStop: function(e) {}
+};
+
+$.ui.mouse.defaults = {
+	cancel: null,
+	distance: 0,
+	delay: 0
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/wp-includes/js/jquery/ui.sortable.js b/wp-includes/js/jquery/ui.sortable.js
index 5c2dcba90b..f5867aec53 100644
--- a/wp-includes/js/jquery/ui.sortable.js
+++ b/wp-includes/js/jquery/ui.sortable.js
@@ -13,659 +13,660 @@
  * Revision: $Id: ui.sortable.js 5433 2008-05-04 20:07:17Z joern.zaefferer $
  */
 ;(function($) {
-	
-	function contains(a, b) { 
-	    var safari2 = $.browser.safari && $.browser.version < 522; 
-	    if (a.contains && !safari2) { 
-	        return a.contains(b); 
-	    } 
-	    if (a.compareDocumentPosition) 
-	        return !!(a.compareDocumentPosition(b) & 16); 
-	    while (b = b.parentNode) 
-	          if (b == a) return true; 
-	    return false; 
-	};
-	
-	$.widget("ui.sortable", {
-		init: function() {
 
-			var o = this.options;
-			this.containerCache = {};
-			this.element.addClass("ui-sortable");
+function contains(a, b) { 
+    var safari2 = $.browser.safari && $.browser.version < 522; 
+    if (a.contains && !safari2) { 
+        return a.contains(b); 
+    } 
+    if (a.compareDocumentPosition) 
+        return !!(a.compareDocumentPosition(b) & 16); 
+    while (b = b.parentNode) 
+          if (b == a) return true; 
+    return false; 
+};
+
+$.widget("ui.sortable", $.extend($.ui.mouse, {
+	init: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+	
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are floating
+		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
 		
-			//Get the items
-			this.refresh();
-	
-			//Let's determine if the items are floating
-			this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
-			
-			//Let's determine the parent's offset
-			if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative');
-			this.offset = this.element.offset();
-	
-			//Initialize mouse events for interaction
-			this.element.mouse({
-				executor: this,
-				delay: o.delay,
-				distance: o.distance || 1,
-				dragPrevention: o.prevention ? o.prevention.toLowerCase().split(',') : ['input','textarea','button','select','option'],
-				start: this.start,
-				stop: this.stop,
-				drag: this.drag,
-				condition: function(e) {
-	
-					if(this.options.disabled || this.options.type == 'static') return false;
-	
-					//Find out if the clicked node (or one of its parents) is a actual item in this.items
-					var currentItem = null, nodes = $(e.target).parents().each(function() {	
-						if($.data(this, 'sortable-item')) {
-							currentItem = $(this);
-							return false;
-						}
-					});
-					if($.data(e.target, 'sortable-item')) currentItem = $(e.target);
-					
-					if(!currentItem) return false;	
-					if(this.options.handle) {
-						var validHandle = false;
-						$(this.options.handle, currentItem).each(function() { if(this == e.target) validHandle = true; });
-						if(!validHandle) return false;
-					}
-						
-					this.currentItem = currentItem;
-					return true;
-	
-				}
-			});
-			
-		},
-		plugins: {},
-		ui: function(inst) {
-			return {
-				helper: (inst || this)["helper"],
-				placeholder: (inst || this)["placeholder"] || $([]),
-				position: (inst || this)["position"].current,
-				absolutePosition: (inst || this)["position"].absolute,
-				instance: this,
-				options: this.options,
-				element: this.element,
-				item: (inst || this)["currentItem"],
-				sender: inst ? inst.element : null
-			};		
-		},
-		propagate: function(n,e,inst) {
-			$.ui.plugin.call(this, n, [e, this.ui(inst)]);
-			this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);
-		},
-		serialize: function(o) {
-			
-			var items = $(this.options.items, this.element).not('.ui-sortable-helper'); //Only the items of the sortable itself
-			var str = []; o = o || {};
-			
-			items.each(function() {
-				var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
-				if(res) str.push((o.key || res[1])+'[]='+(o.key ? res[1] : res[2]));
-			});
-			
-			return str.join('&');
-			
-		},
-		toArray: function(attr) {
-			var items = $(this.options.items, this.element).not('.ui-sortable-helper'); //Only the items of the sortable itself
-			var ret = [];
+		//Let's determine the parent's offset
+		if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative');
+		this.offset = this.element.offset();
 
-			items.each(function() { ret.push($(this).attr(attr || 'id')); });
-			return ret;
-		},
-		enable: function() {
-			this.element.removeClass("ui-sortable-disabled");
-			this.options.disabled = false;
-		},
-		disable: function() {
-			this.element.addClass("ui-sortable-disabled");
-			this.options.disabled = true;
-		},
-		/* Be careful with the following core functions */
-		intersectsWith: function(item) {
-			
-			var x1 = this.position.absolute.left, x2 = x1 + this.helperProportions.width,
-			y1 = this.position.absolute.top, y2 = y1 + this.helperProportions.height;
-			var l = item.left, r = l + item.width, 
+		//Initialize mouse events for interaction
+		this.mouseInit();
+		
+	},
+	plugins: {},
+	ui: function(inst) {
+		return {
+			helper: (inst || this)["helper"],
+			placeholder: (inst || this)["placeholder"] || $([]),
+			position: (inst || this)["position"],
+			absolutePosition: (inst || this)["positionAbs"],
+			options: this.options,
+			element: this.element,
+			item: (inst || this)["currentItem"],
+			sender: inst ? inst.element : null
+		};		
+	},
+	propagate: function(n,e,inst, noPropagation) {
+		$.ui.plugin.call(this, n, [e, this.ui(inst)]);
+		if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);
+	},
+	serialize: function(o) {
+		
+		
+		
+		var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
+		var str = []; o = o || {};
+		
+		items.each(function() {
+			var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+			if(res) str.push((o.key || res[1])+'[]='+(o.key ? res[1] : res[2]));
+		});
+		
+		return str.join('&');
+		
+	},
+	toArray: function(attr) {
+		var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
+		var ret = [];
+
+		items.each(function() { ret.push($(this).attr(attr || 'id')); });
+		return ret;
+	},
+	enable: function() {
+		this.element.removeClass("ui-sortable-disabled");
+		this.options.disabled = false;
+	},
+	disable: function() {
+		this.element.addClass("ui-sortable-disabled");
+		this.options.disabled = true;
+	},
+	/* Be careful with the following core functions */
+	intersectsWith: function(item) {
+		
+		var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
+		y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
+		var l = item.left, r = l + item.width, 
+		t = item.top, b = t + item.height;
+
+		if(this.options.tolerance == "pointer") {
+			return (y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r);
+		} else {
+		
+			return (l < x1 + (this.helperProportions.width / 2) // Right Half
+				&& x2 - (this.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
+				&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
+		
+		}
+		
+	},
+	intersectsWithEdge: function(item) {	
+		var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
+		var l = item.left, r = l + item.width, 
 			t = item.top, b = t + item.height;
 
-			if(this.options.tolerance == "pointer") {
-				return (y1 + this.clickOffset.top > t && y1 + this.clickOffset.top < b && x1 + this.clickOffset.left > l && x1 + this.clickOffset.left < r);
+		if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.currentItem[0]['offset'+(this.floating ? 'Width' : 'Height')] > item.item[0]['offset'+(this.floating ? 'Width' : 'Height')])) {
+
+			if(!(y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r)) return false;
+			
+			if(this.floating) {
+				if(x1 + this.offset.click.left > l && x1 + this.offset.click.left < l + item.width/2) return 2;
+				if(x1 + this.offset.click.left > l+item.width/2 && x1 + this.offset.click.left < r) return 1;
 			} else {
-			
-				return (l < x1 + (this.helperProportions.width / 2) // Right Half
-					&& x2 - (this.helperProportions.width / 2) < r // Left Half
-					&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-					&& y2 - (this.helperProportions.height / 2) < b ); // Top Half
-			
-			}
-			
-		},
-		intersectsWithEdge: function(item) {	
-			var x1 = this.position.absolute.left, x2 = x1 + this.helperProportions.width,
-				y1 = this.position.absolute.top, y2 = y1 + this.helperProportions.height;
-			var l = item.left, r = l + item.width, 
-				t = item.top, b = t + item.height;
-
-			if(this.options.tolerance == "pointer") {
-
-				if(!(y1 + this.clickOffset.top > t && y1 + this.clickOffset.top < b && x1 + this.clickOffset.left > l && x1 + this.clickOffset.left < r)) return false;
-				
-				if(this.floating) {
-					if(x1 + this.clickOffset.left > l && x1 + this.clickOffset.left < l + item.width/2) return 2;
-					if(x1 + this.clickOffset.left > l+item.width/2 && x1 + this.clickOffset.left < r) return 1;
-				} else {
-					if(y1 + this.clickOffset.top > t && y1 + this.clickOffset.top < t + item.height/2) return 2;
-					if(y1 + this.clickOffset.top > t+item.height/2 && y1 + this.clickOffset.top < b) return 1;
-				}
-
-			} else {
-			
-				if (!(l < x1 + (this.helperProportions.width / 2) // Right Half
-					&& x2 - (this.helperProportions.width / 2) < r // Left Half
-					&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
-					&& y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half
-				
-				if(this.floating) {
-					if(x2 > l && x1 < l) return 2; //Crosses left edge
-					if(x1 < r && x2 > r) return 1; //Crosses right edge
-				} else {
-					if(y2 > t && y1 < t) return 1; //Crosses top edge
-					if(y1 < b && y2 > b) return 2; //Crosses bottom edge
-				}
-			
-			}
-			
-			return false;
-			
-		},
-		//This method checks approximately if the item is dragged in a container, but doesn't touch any items
-		inEmptyZone: function(container) {
-
-			if(!$(container.options.items, container.element).length) {
-				return container.options.dropOnEmpty ? true : false;
-			};
-
-			var last = $(container.options.items, container.element).not('.ui-sortable-helper'); last = $(last[last.length-1]);
-			var top = last.offset()[this.floating ? 'left' : 'top'] + last[0][this.floating ? 'offsetWidth' : 'offsetHeight'];
-			return (this.position.absolute[this.floating ? 'left' : 'top'] > top);
-		},
-		refresh: function() {
-			this.refreshItems();
-			this.refreshPositions();
-		},
-		refreshItems: function() {
-			
-			this.items = [];
-			this.containers = [this];
-			var items = this.items;
-			var queries = [$(this.options.items, this.element)];
-			
-			if(this.options.connectWith) {
-				for (var i = this.options.connectWith.length - 1; i >= 0; i--){
-					var cur = $(this.options.connectWith[i]);
-					for (var j = cur.length - 1; j >= 0; j--){
-						var inst = $.data(cur[j], 'sortable');
-						if(inst && !inst.options.disabled) {
-							queries.push($(inst.options.items, inst.element));
-							this.containers.push(inst);
-						}
-					};
-				};
+				if(y1 + this.offset.click.top > t && y1 + this.offset.click.top < t + item.height/2) return 2;
+				if(y1 + this.offset.click.top > t+item.height/2 && y1 + this.offset.click.top < b) return 1;
 			}
 
-			for (var i = queries.length - 1; i >= 0; i--){
-				queries[i].each(function() {
-					$.data(this, 'sortable-item', true); // Data for target checking (mouse manager)
-					items.push({
-						item: $(this),
-						width: 0, height: 0,
-						left: 0, top: 0
-					});
-				});
-			};
-
-		},
-		refreshPositions: function(fast) {
-			for (var i = this.items.length - 1; i >= 0; i--){
-				var t = this.items[i].item;
-				if(!fast) this.items[i].width = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).outerWidth();
-				if(!fast) this.items[i].height = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).outerHeight();
-				var p = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).offset();
-				this.items[i].left = p.left;
-				this.items[i].top = p.top;
-			};
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				var p =this.containers[i].element.offset();
-				this.containers[i].containerCache.left = p.left;
-				this.containers[i].containerCache.top = p.top;
-				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
-				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
-			};
-		},
-		destroy: function() {
-			this.element
-				.removeClass("ui-sortable ui-sortable-disabled")
-				.removeData("sortable")
-				.unbind(".sortable")
-				.mouse("destroy");
-			
-			for ( var i = this.items.length - 1; i >= 0; i-- )
-				this.items[i].item.removeData("sortable-item");
-		},
-		createPlaceholder: function(that) {
-			(that || this).placeholderElement = this.options.placeholderElement ? $(this.options.placeholderElement, (that || this).currentItem) : (that || this).currentItem;
-			(that || this).placeholder = $('<div></div>')
-				.addClass(this.options.placeholder)
-				.appendTo('body')
-				.css({ position: 'absolute' })
-				.css((that || this).placeholderElement.offset())
-				.css({ width: (that || this).placeholderElement.outerWidth(), height: (that || this).placeholderElement.outerHeight() })
-				;
-		},
-		contactContainers: function(e) {
-			for (var i = this.containers.length - 1; i >= 0; i--){
-
-				if(this.intersectsWith(this.containers[i].containerCache)) {
-					if(!this.containers[i].containerCache.over) {
-						
-
-						if(this.currentContainer != this.containers[i]) {
-							
-							//When entering a new container, we will find the item with the least distance and append our item near it
-							var dist = 10000; var itemWithLeastDistance = null; var base = this.position.absolute[this.containers[i].floating ? 'left' : 'top'];
-							for (var j = this.items.length - 1; j >= 0; j--) {
-								if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue;
-								var cur = this.items[j][this.containers[i].floating ? 'left' : 'top'];
-								if(Math.abs(cur - base) < dist) {
-									dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
-								}
-							}
-							
-							//We also need to exchange the placeholder
-							if(this.placeholder) this.placeholder.remove();
-							if(this.containers[i].options.placeholder) {
-								this.containers[i].createPlaceholder(this);
-							} else {
-								this.placeholder = null; this.placeholderElement = null;
-							}
-							
-							
-							itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance) : this.rearrange(e, null, this.containers[i].element);
-							this.propagate("change", e); //Call plugins and callbacks
-							this.containers[i].propagate("change", e, this); //Call plugins and callbacks
-							this.currentContainer = this.containers[i];
-
-						}
-						
-						this.containers[i].propagate("over", e, this);
-						this.containers[i].containerCache.over = 1;
-					}
-				} else {
-					if(this.containers[i].containerCache.over) {
-						this.containers[i].propagate("out", e, this);
-						this.containers[i].containerCache.over = 0;
-					}
-				}
-				
-			};			
-		},
-		start: function(e,el) {
+		} else {
 		
-			var o = this.options;
-			this.currentContainer = this;
-			this.refresh();
-
-			//Create and append the visible helper
-			this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone();
-			if(!this.helper.parents('body').length) this.helper.appendTo(o.appendTo || this.currentItem[0].parentNode); //Add the helper to the DOM if that didn't happen already
-			this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class
+			if (!(l < x1 + (this.helperProportions.width / 2) // Right Half
+				&& x2 - (this.helperProportions.width / 2) < r // Left Half
+				&& t < y1 + (this.helperProportions.height / 2) // Bottom Half
+				&& y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half
 			
-			//Prepare variables for position generation
-			$.extend(this, {
-				offsetParent: this.helper.offsetParent(),
-				offsets: {
-					absolute: this.currentItem.offset()
-				},
-				mouse: {
-					start: { top: e.pageY, left: e.pageX }
-				},
-				margins: {
-					top: parseInt(this.currentItem.css("marginTop")) || 0,
-					left: parseInt(this.currentItem.css("marginLeft")) || 0
-				}
-			});
-			
-			//The relative click offset
-			this.offsets.parent = this.offsetParent.offset();
-			this.clickOffset = { left: e.pageX - this.offsets.absolute.left, top: e.pageY - this.offsets.absolute.top };
-			
-			this.originalPosition = {
-				left: this.offsets.absolute.left - this.offsets.parent.left - this.margins.left,
-				top: this.offsets.absolute.top - this.offsets.parent.top - this.margins.top
+			if(this.floating) {
+				if(x2 > l && x1 < l) return 2; //Crosses left edge
+				if(x1 < r && x2 > r) return 1; //Crosses right edge
+			} else {
+				if(y2 > t && y1 < t) return 1; //Crosses top edge
+				if(y1 < b && y2 > b) return 2; //Crosses bottom edge
 			}
-			
-			//Generate a flexible offset that will later be subtracted from e.pageX/Y
-			//I hate margins - they need to be removed before positioning the element absolutely..
-			this.offset = {
-				left: e.pageX - this.originalPosition.left,
-				top: e.pageY - this.originalPosition.top
-			};
-
-			//Save the first time position
-			$.extend(this, {
-				position: {
-					current: { top: e.pageY - this.offset.top, left: e.pageX - this.offset.left },
-					absolute: { left: e.pageX - this.clickOffset.left, top: e.pageY - this.clickOffset.top },
-					dom: this.currentItem.prev()[0]
-				}
-			});
-
-			//If o.placeholder is used, create a new element at the given position with the class
-			if(o.placeholder) this.createPlaceholder();
-
-			this.propagate("start", e); //Call plugins and callbacks
-			this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() }; //Save and store the helper proportions
-
-			//If we have something in cursorAt, we'll use it
-			if(o.cursorAt) {
-				if(o.cursorAt.top != undefined || o.cursorAt.bottom != undefined) {
-					this.offset.top -= this.clickOffset.top - (o.cursorAt.top != undefined ? o.cursorAt.top : (this.helperProportions.height - o.cursorAt.bottom));
-					this.clickOffset.top = (o.cursorAt.top != undefined ? o.cursorAt.top : (this.helperProportions.height - o.cursorAt.bottom));
-				}
-				if(o.cursorAt.left != undefined || o.cursorAt.right != undefined) {
-					this.offset.left -= this.clickOffset.left - (o.cursorAt.left != undefined ? o.cursorAt.left : (this.helperProportions.width - o.cursorAt.right));
-					this.clickOffset.left = (o.cursorAt.left != undefined ? o.cursorAt.left : (this.helperProportions.width - o.cursorAt.right));
-				}
-			}
-
-			if(this.options.placeholder != 'clone') $(this.currentItem).css('visibility', 'hidden'); //Set the original element visibility to hidden to still fill out the white space
-			for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); } //Post 'activate' events to possible containers
-			
-			//Prepare possible droppables
-			if($.ui.ddmanager) $.ui.ddmanager.current = this;
-			if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
-
-			this.dragging = true;
-			return false;
-			
-		},
-		stop: function(e) {
-
-			this.propagate("stop", e); //Call plugins and trigger callbacks
-			if(this.position.dom != this.currentItem.prev()[0]) this.propagate("update", e); //Trigger update callback if the DOM position has changed
-			if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
-				this.propagate("remove", e);
-				for (var i = this.containers.length - 1; i >= 0; i--){
-					if(contains(this.containers[i].element[0], this.currentItem[0])) {
-						this.containers[i].propagate("update", e, this);
-						this.containers[i].propagate("receive", e, this);
+		
+		}
+		
+		return false;
+		
+	},
+	refresh: function() {
+		this.refreshItems();
+		this.refreshPositions();
+	},
+	refreshItems: function() {
+		
+		this.items = [];
+		this.containers = [this];
+		var items = this.items;
+		var queries = [$.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)];
+		
+		if(this.options.connectWith) {
+			for (var i = this.options.connectWith.length - 1; i >= 0; i--){
+				var cur = $(this.options.connectWith[i]);
+				for (var j = cur.length - 1; j >= 0; j--){
+					var inst = $.data(cur[j], 'sortable');
+					if(inst && !inst.options.disabled) {
+						queries.push($.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element));
+						this.containers.push(inst);
 					}
 				};
 			};
-			
-			//Post events to containers
-			for (var i = this.containers.length - 1; i >= 0; i--){
-				this.containers[i].propagate("deactivate", e, this);
+		}
+
+		for (var i = queries.length - 1; i >= 0; i--){
+			queries[i].each(function() {
+				$.data(this, 'sortable-item', true); // Data for target checking (mouse manager)
+				items.push({
+					item: $(this),
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			});
+		};
+
+	},
+	refreshPositions: function(fast) {
+		for (var i = this.items.length - 1; i >= 0; i--){
+			var t = this.items[i].item;
+			if(!fast) this.items[i].width = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).outerWidth();
+			if(!fast) this.items[i].height = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).outerHeight();
+			var p = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).offset();
+			this.items[i].left = p.left;
+			this.items[i].top = p.top;
+		};
+		for (var i = this.containers.length - 1; i >= 0; i--){
+			var p =this.containers[i].element.offset();
+			this.containers[i].containerCache.left = p.left;
+			this.containers[i].containerCache.top = p.top;
+			this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+			this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+		};
+	},
+	destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled")
+			.removeData("sortable")
+			.unbind(".sortable");
+		this.mouseDestroy();
+		
+		for ( var i = this.items.length - 1; i >= 0; i-- )
+			this.items[i].item.removeData("sortable-item");
+	},
+	createPlaceholder: function(that) {
+		
+		var self = that || this, o = self.options;
+
+		if(o.placeholder.constructor == String) {
+			var className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+					return $('<div></div>').addClass(className)[0];
+				},
+				update: function(i, p) {
+					p.css(i.offset()).css({ width: i.outerWidth(), height: i.outerHeight() });
+				}
+			};
+		}
+		
+		self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem)).appendTo('body').css({ position: 'absolute' });
+		o.placeholder.update.call(self.element, self.currentItem, self.placeholder);
+	},
+	contactContainers: function(e) {
+		for (var i = this.containers.length - 1; i >= 0; i--){
+
+			if(this.intersectsWith(this.containers[i].containerCache)) {
+				if(!this.containers[i].containerCache.over) {
+					
+
+					if(this.currentContainer != this.containers[i]) {
+						
+						//When entering a new container, we will find the item with the least distance and append our item near it
+						var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[i].floating ? 'left' : 'top'];
+						for (var j = this.items.length - 1; j >= 0; j--) {
+							if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue;
+							var cur = this.items[j][this.containers[i].floating ? 'left' : 'top'];
+							if(Math.abs(cur - base) < dist) {
+								dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+							}
+						}
+						
+						if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
+							continue;
+						
+						//We also need to exchange the placeholder
+						if(this.placeholder) this.placeholder.remove();
+						if(this.containers[i].options.placeholder) {
+							this.containers[i].createPlaceholder(this);
+						} else {
+							this.placeholder = null;;
+						}
+						
+						
+						itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance) : this.rearrange(e, null, this.containers[i].element);
+						this.propagate("change", e); //Call plugins and callbacks
+						this.containers[i].propagate("change", e, this); //Call plugins and callbacks
+						this.currentContainer = this.containers[i];
+
+					}
+					
+					this.containers[i].propagate("over", e, this);
+					this.containers[i].containerCache.over = 1;
+				}
+			} else {
 				if(this.containers[i].containerCache.over) {
 					this.containers[i].propagate("out", e, this);
 					this.containers[i].containerCache.over = 0;
 				}
 			}
 			
-			//If we are using droppables, inform the manager about the drop
-			if ($.ui.ddmanager && !this.options.dropBehaviour) $.ui.ddmanager.drop(this, e);
-			
-			this.dragging = false;
-			if(this.cancelHelperRemoval) return false;
-			$(this.currentItem).css('visibility', '');
-			if(this.placeholder) this.placeholder.remove();
-			this.helper.remove();
+		};			
+	},
+	mouseStart: function(e, overrideHandle, noActivation) {
+	
+		var o = this.options;
+		this.currentContainer = this;
+		
+		if(this.options.disabled || this.options.type == 'static') return false;
 
-			return false;
-			
-		},
-		drag: function(e) {
-
-			//Compute the helpers position
-			this.position.current = { top: e.pageY - this.offset.top, left: e.pageX - this.offset.left };
-			this.position.absolute = { left: e.pageX - this.clickOffset.left, top: e.pageY - this.clickOffset.top };
-
-			//Rearrange
-			for (var i = this.items.length - 1; i >= 0; i--) {
-				var intersection = this.intersectsWithEdge(this.items[i]);
-				if(!intersection) continue;
-				
-				if(this.items[i].item[0] != this.currentItem[0] //cannot intersect with itself
-					&&	this.currentItem[intersection == 1 ? "next" : "prev"]()[0] != this.items[i].item[0] //no useless actions that have been done before
-					&&	!contains(this.currentItem[0], this.items[i].item[0]) //no action if the item moved is the parent of the item checked
-					&& (this.options.type == 'semi-dynamic' ? !contains(this.element[0], this.items[i].item[0]) : true)
-				) {
-					
-					this.direction = intersection == 1 ? "down" : "up";
-					this.rearrange(e, this.items[i]);
-					this.propagate("change", e); //Call plugins and callbacks
-					break;
-				}
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		var currentItem = null, nodes = $(e.target).parents().each(function() {	
+			if($.data(this, 'sortable-item')) {
+				currentItem = $(this);
+				return false;
 			}
-			
-			//Post events to containers
-			this.contactContainers(e);
-			
-			//Interconnect with droppables
-			if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
-
-			this.propagate("sort", e); //Call plugins and callbacks
-			this.helper.css({ left: this.position.current.left+'px', top: this.position.current.top+'px' }); // Stick the helper to the cursor
-			return false;
-			
-		},
-		rearrange: function(e, i, a) {
-			a ? a.append(this.currentItem) : i.item[this.direction == 'down' ? 'before' : 'after'](this.currentItem);
-			this.refreshPositions(true); //Precompute after each DOM insertion, NOT on mousemove
-			if(this.placeholderElement) this.placeholder.css(this.placeholderElement.offset());
-			if(this.placeholderElement && this.placeholderElement.is(":visible")) this.placeholder.css({ width: this.placeholderElement.outerWidth(), height: this.placeholderElement.outerHeight() });
-		}
-	});
+		});
+		if($.data(e.target, 'sortable-item')) currentItem = $(e.target);
 	
-	$.extend($.ui.sortable, {
-		getter: "serialize toArray",
-		defaults: {
-			items: '> *',
-			zIndex: 1000
+		if(!currentItem) return false;
+		if(this.options.handle && !overrideHandle) {
+			var validHandle = false;
+			$(this.options.handle, currentItem).each(function() { if(this == e.target) validHandle = true; });
+			if(!validHandle) return false;
 		}
-	});
+			
+		this.currentItem = currentItem;
 
+		this.refresh();
+
+		//Create and append the visible helper			
+		this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone();
+		if(!this.helper.parents('body').length) this.helper.appendTo((o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)); //Add the helper to the DOM if that didn't happen already
+		this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		this.margins = {																				//Cache the margins
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};		
 	
+		this.offset = this.currentItem.offset();														//The element's absolute position on the page
+		this.offset = {																					//Substract the margins from the element's absolute offset
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+		
+		this.offset.click = {																			//Where the click happened, relative to the element
+			left: e.pageX - this.offset.left,
+			top: e.pageY - this.offset.top
+		};
+		
+		this.offsetParent = this.helper.offsetParent(); var po = this.offsetParent.offset();			//Get the offsetParent and cache its position
+
+		this.offset.parent = {																			//Store its position plus border
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+	
+		this.originalPosition = this.generatePosition(e);												//Generate the original position
+		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size
+		
+		if(o.cursorAt) {
+			if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left;
+			if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right;
+			if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top;
+			if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom;
+		}
+
+		this.domPosition = this.currentItem.prev()[0];													//Cache the former DOM position
+
+		/*
+		 * - Position constraining -
+		 * Here we prepare position constraining like grid and containment.
+		 */	
+		
+		if(o.containment) {
+			if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
+			if(o.containment == 'document') this.containment = [0,0,$(document).width(), ($(document).height() || document.body.parentNode.scrollHeight)];
+			if(!(/^(document|window|parent)$/).test(o.containment)) {
+				var ce = $(o.containment)[0];
+				var co = $(o.containment).offset();
+				
+				this.containment = [
+					co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left,
+					co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top,
+					co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
+					co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
+				];
+			}
+		}
+		
+		//If o.placeholder is used, create a new element at the given position with the class
+		if(o.placeholder) this.createPlaceholder();
+		
+		//Call plugins and callbacks
+		this.propagate("start", e);
+		this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
+
+		if(this.options.placeholder != 'clone') this.currentItem.css('visibility', 'hidden'); //Set the original element visibility to hidden to still fill out the white space
+		
+		if(!noActivation) {
+			 for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); } //Post 'activate' events to possible containers
+		}
+		
+		//Prepare possible droppables
+		if($.ui.ddmanager) $.ui.ddmanager.current = this;
+		if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
+
+		this.dragging = true;
+
+		this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+
+	},
+	convertPositionTo: function(d, pos) {
+		if(!pos) pos = this.position;
+		var mod = d == "absolute" ? 1 : -1;
+		return {
+			top: (
+				pos.top																	// the calculated relative position
+				+ this.offset.parent.top * mod											// The offsetParent's offset without borders (offset + border)
+				- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) * mod	// The offsetParent's scroll position
+				+ this.margins.top * mod												//Add the margin (you don't want the margin counting in intersection methods)
+			),
+			left: (
+				pos.left																// the calculated relative position
+				+ this.offset.parent.left * mod											// The offsetParent's offset without borders (offset + border)
+				- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) * mod	// The offsetParent's scroll position
+				+ this.margins.left * mod												//Add the margin (you don't want the margin counting in intersection methods)
+			)
+		};
+	},
+	generatePosition: function(e) {
+		
+		var o = this.options;
+		var position = {
+			top: (
+				e.pageY																	// The absolute mouse position
+				- this.offset.click.top													// Click offset (relative to the element)
+				- this.offset.parent.top												// The offsetParent's offset without borders (offset + border)
+				+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)	// The offsetParent's scroll position, not if the element is fixed
+			),
+			left: (
+				e.pageX																	// The absolute mouse position
+				- this.offset.click.left												// Click offset (relative to the element)
+				- this.offset.parent.left												// The offsetParent's offset without borders (offset + border)
+				+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft)	// The offsetParent's scroll position, not if the element is fixed
+			)
+		};
+		
+		if(!this.originalPosition) return position;										//If we are not dragging yet, we won't check for options
+		
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+		if(this.containment) {
+			if(position.left < this.containment[0]) position.left = this.containment[0];
+			if(position.top < this.containment[1]) position.top = this.containment[1];
+			if(position.left > this.containment[2]) position.left = this.containment[2];
+			if(position.top > this.containment[3]) position.top = this.containment[3];
+		}
+		
+		if(o.grid) {
+			var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
+			position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+			
+			var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
+			position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+		}
+		
+		return position;
+	},
+	mouseDrag: function(e) {
+
+
+		//Compute the helpers position
+		this.position = this.generatePosition(e);
+		this.positionAbs = this.convertPositionTo("absolute");
+
+		//Rearrange
+		for (var i = this.items.length - 1; i >= 0; i--) {
+			var intersection = this.intersectsWithEdge(this.items[i]);
+			if(!intersection) continue;
+			
+			if(this.items[i].item[0] != this.currentItem[0] //cannot intersect with itself
+				&&	this.currentItem[intersection == 1 ? "next" : "prev"]()[0] != this.items[i].item[0] //no useless actions that have been done before
+				&&	!contains(this.currentItem[0], this.items[i].item[0]) //no action if the item moved is the parent of the item checked
+				&& (this.options.type == 'semi-dynamic' ? !contains(this.element[0], this.items[i].item[0]) : true)
+			) {
+				
+				this.direction = intersection == 1 ? "down" : "up";
+				this.rearrange(e, this.items[i]);
+				this.propagate("change", e); //Call plugins and callbacks
+				break;
+			}
+		}
+		
+		//Post events to containers
+		this.contactContainers(e);
+		
+		 //Call plugins and callbacks
+		this.propagate("sort", e);
+
+		if(!this.options.axis || this.options.axis == "x") this.helper[0].style.left = this.position.left+'px';
+		if(!this.options.axis || this.options.axis == "y") this.helper[0].style.top = this.position.top+'px';
+		
+		//Interconnect with droppables
+		if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
+
+		return false;
+		
+	},
+	mouseStop: function(e, noPropagation) {
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour)
+			$.ui.ddmanager.drop(this, e);
+			
+		if(this.options.revert) {
+			var self = this;
+			var cur = self.currentItem.offset();
+
+			//Also animate the placeholder if we have one
+			if(self.placeholder) self.placeholder.animate({ opacity: 'hide' }, (parseInt(this.options.revert, 10) || 500)-50);
+
+			$(this.helper).animate({
+				left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
+				top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
+			}, parseInt(this.options.revert, 10) || 500, function() {
+				self.propagate("stop", e, null, noPropagation);
+				self.clear(e);
+			});
+		} else {
+			this.propagate("stop", e, null, noPropagation);
+			this.clear(e, noPropagation);
+		}
+
+		return false;
+		
+	},
+	clear: function(e, noPropagation) {
+		
+		if(this.domPosition != this.currentItem.prev()[0]) this.propagate("update", e, null, noPropagation); //Trigger update callback if the DOM position has changed
+		if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
+			this.propagate("remove", e, null, noPropagation);
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				if(contains(this.containers[i].element[0], this.currentItem[0])) {
+					this.containers[i].propagate("update", e, this, noPropagation);
+					this.containers[i].propagate("receive", e, this, noPropagation);
+				}
+			};
+		};
+		
+		//Post events to containers
+		for (var i = this.containers.length - 1; i >= 0; i--){
+			this.containers[i].propagate("deactivate", e, this, noPropagation);
+			if(this.containers[i].containerCache.over) {
+				this.containers[i].propagate("out", e, this);
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+		
+		this.dragging = false;
+		if(this.cancelHelperRemoval) return false;
+		$(this.currentItem).css('visibility', '');
+		if(this.placeholder) this.placeholder.remove();
+		this.helper.remove();
+		
+		return true;
+		
+	},
+	rearrange: function(e, i, a) {
+		a ? a.append(this.currentItem) : i.item[this.direction == 'down' ? 'before' : 'after'](this.currentItem);
+		this.refreshPositions(true); //Precompute after each DOM insertion, NOT on mousemove
+		if(this.options.placeholder) this.options.placeholder.update.call(this.element, this.currentItem, this.placeholder);
+	}
+}));
+
+$.extend($.ui.sortable, {
+	getter: "serialize toArray",
+	defaults: {
+		tolerance: "guess",
+		distance: 0,
+		delay: 0,
+		cancel: ":input,button",
+		items: '> *',
+		zIndex: 1000,
+		dropOnEmpty: true,
+		appendTo: "parent"
+	}
+});
+
 /*
  * Sortable Extensions
  */
 
-	$.ui.plugin.add("sortable", "cursor", {
-		start: function(e, ui) {
-			var t = $('body');
-			if (t.css("cursor")) ui.options._cursor = t.css("cursor");
-			t.css("cursor", ui.options.cursor);
-		},
-		stop: function(e, ui) {
-			if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
-		}
-	});
+$.ui.plugin.add("sortable", "cursor", {
+	start: function(e, ui) {
+		var t = $('body');
+		if (t.css("cursor")) ui.options._cursor = t.css("cursor");
+		t.css("cursor", ui.options.cursor);
+	},
+	stop: function(e, ui) {
+		if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
+	}
+});
 
-	$.ui.plugin.add("sortable", "zIndex", {
-		start: function(e, ui) {
-			var t = ui.helper;
-			if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
-			t.css('zIndex', ui.options.zIndex);
-		},
-		stop: function(e, ui) {
-			if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
-		}
-	});
+$.ui.plugin.add("sortable", "zIndex", {
+	start: function(e, ui) {
+		var t = ui.helper;
+		if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
+		t.css('zIndex', ui.options.zIndex);
+	},
+	stop: function(e, ui) {
+		if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
+	}
+});
 
-	$.ui.plugin.add("sortable", "opacity", {
-		start: function(e, ui) {
-			var t = ui.helper;
-			if(t.css("opacity")) ui.options._opacity = t.css("opacity");
-			t.css('opacity', ui.options.opacity);
-		},
-		stop: function(e, ui) {
-			if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
-		}
-	});
-
-
-	$.ui.plugin.add("sortable", "revert", {
-		stop: function(e, ui) {
-			var self = ui.instance;
-			self.cancelHelperRemoval = true;
-			var cur = self.currentItem.offset();
-			var op = self.helper.offsetParent().offset();
-			if(ui.instance.options.zIndex) ui.helper.css('zIndex', ui.instance.options.zIndex); //Do the zIndex again because it already was resetted by the plugin above on stop
-
-			//Also animate the placeholder if we have one
-			if(ui.instance.placeholder) ui.instance.placeholder.animate({ opacity: 'hide' }, parseInt(ui.options.revert, 10) || 500);
-			
-			
-			ui.helper.animate({
-				left: cur.left - op.left - self.margins.left,
-				top: cur.top - op.top - self.margins.top
-			}, parseInt(ui.options.revert, 10) || 500, function() {
-				self.currentItem.css('visibility', 'visible');
-				window.setTimeout(function() {
-					if(self.placeholder) self.placeholder.remove();
-					self.helper.remove();
-					if(ui.options._zIndex) ui.helper.css('zIndex', ui.options._zIndex);
-				}, 50);
-			});
-		}
-	});
+$.ui.plugin.add("sortable", "opacity", {
+	start: function(e, ui) {
+		var t = ui.helper;
+		if(t.css("opacity")) ui.options._opacity = t.css("opacity");
+		t.css('opacity', ui.options.opacity);
+	},
+	stop: function(e, ui) {
+		if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
+	}
+});
 
+$.ui.plugin.add("sortable", "scroll", {
+	start: function(e, ui) {
+		var o = ui.options;
+		var i = $(this).data("sortable");
+		o.scrollSensitivity	= o.scrollSensitivity || 20;
+		o.scrollSpeed		= o.scrollSpeed || 20;
 	
-	$.ui.plugin.add("sortable", "containment", {
-		start: function(e, ui) {
-
-			var o = ui.options;
-			if((o.containment.left != undefined || o.containment.constructor == Array) && !o._containment) return;
-			if(!o._containment) o._containment = o.containment;
-
-			if(o._containment == 'parent') o._containment = this[0].parentNode;
-			if(o._containment == 'sortable') o._containment = this[0];
-			if(o._containment == 'document') {
-				o.containment = [
-					0,
-					0,
-					$(document).width(),
-					($(document).height() || document.body.parentNode.scrollHeight)
-				];
-			} else { //I'm a node, so compute top/left/right/bottom
-
-				var ce = $(o._containment);
-				var co = ce.offset();
-
-				o.containment = [
-					co.left,
-					co.top,
-					co.left+(ce.outerWidth() || ce[0].scrollWidth),
-					co.top+(ce.outerHeight() || ce[0].scrollHeight)
-				];
-			}
-
-		},
-		sort: function(e, ui) {
-
-			var o = ui.options;
-			var h = ui.helper;
-			var c = o.containment;
-			var self = ui.instance;
-			var borderLeft = (parseInt(self.offsetParent.css("borderLeftWidth"), 10) || 0);
-			var borderRight = (parseInt(self.offsetParent.css("borderRightWidth"), 10) || 0);
-			var borderTop = (parseInt(self.offsetParent.css("borderTopWidth"), 10) || 0);
-			var borderBottom = (parseInt(self.offsetParent.css("borderBottomWidth"), 10) || 0);
-			
-			if(c.constructor == Array) {
-				if((self.position.absolute.left < c[0])) self.position.current.left = c[0] - self.offsets.parent.left - self.margins.left;
-				if((self.position.absolute.top < c[1])) self.position.current.top = c[1] - self.offsets.parent.top - self.margins.top;
-				if(self.position.absolute.left - c[2] + self.helperProportions.width >= 0) self.position.current.left = c[2] - self.offsets.parent.left - self.helperProportions.width - self.margins.left - borderLeft - borderRight;
-				if(self.position.absolute.top - c[3] + self.helperProportions.height >= 0) self.position.current.top = c[3] - self.offsets.parent.top - self.helperProportions.height - self.margins.top - borderTop - borderBottom;
-			} else {
-				if((ui.position.left < c.left)) self.position.current.left = c.left;
-				if((ui.position.top < c.top)) self.position.current.top = c.top;
-				if(ui.position.left - self.offsetParent.innerWidth() + self.helperProportions.width + c.right + borderLeft + borderRight >= 0) self.position.current.left = self.offsetParent.innerWidth() - self.helperProportions.width - c.right - borderLeft - borderRight;
-				if(ui.position.top - self.offsetParent.innerHeight() + self.helperProportions.height + c.bottom + borderTop + borderBottom >= 0) self.position.current.top = self.offsetParent.innerHeight() - self.helperProportions.height - c.bottom - borderTop - borderBottom;
-			}
-
+		i.overflowY = function(el) {
+			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
+			return $(document);
+		}(i.currentItem);
+		i.overflowX = function(el) {
+			do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
+			return $(document);
+		}(i.currentItem);
+		
+		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
+		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
+		
+	},
+	sort: function(e, ui) {
+		
+		var o = ui.options;
+		var i = $(this).data("sortable");
+		
+		if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
+			if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
+				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
+			if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
+				i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;
+		} else {
+			if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
+				$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+			if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
+				$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
 		}
-	});
-
-	$.ui.plugin.add("sortable", "axis", {
-		sort: function(e, ui) {
-			var o = ui.options;
-			if(o.constraint) o.axis = o.constraint; //Legacy check
-			o.axis == 'x' ? ui.instance.position.current.top = ui.instance.originalPosition.top : ui.instance.position.current.left = ui.instance.originalPosition.left;
+		
+		if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
+			if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
+				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
+			if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity)
+				i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;
+		} else {
+			if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
+				$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+			if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
+				$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
 		}
-	});
-
-	$.ui.plugin.add("sortable", "scroll", {
-		start: function(e, ui) {
-			var o = ui.options;
-			o.scrollSensitivity	= o.scrollSensitivity || 20;
-			o.scrollSpeed		= o.scrollSpeed || 20;
-
-			ui.instance.overflowY = function(el) {
-				do { if((/auto|scroll/).test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
-				return $(document);
-			}(this);
-			ui.instance.overflowX = function(el) {
-				do { if((/auto|scroll/).test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
-				return $(document);
-			}(this);
-			
-			if(ui.instance.overflowY[0] != document && ui.instance.overflowY[0].tagName != 'HTML') ui.instance.overflowYstart = ui.instance.overflowY[0].scrollTop;
-			if(ui.instance.overflowX[0] != document && ui.instance.overflowX[0].tagName != 'HTML') ui.instance.overflowXstart = ui.instance.overflowX[0].scrollLeft;
-			
-		},
-		sort: function(e, ui) {
-			
-			var o = ui.options;
-			var i = ui.instance;
-
-			if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
-				if(i.overflowY[0].offsetHeight - (ui.position.top - i.overflowY[0].scrollTop + i.clickOffset.top) < o.scrollSensitivity)
-					i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
-				if((ui.position.top - i.overflowY[0].scrollTop + i.clickOffset.top) < o.scrollSensitivity)
-					i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;				
-			} else {
-				//$(document.body).append('<p>'+(e.pageY - $(document).scrollTop())+'</p>');
-				if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
-					$(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
-				if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
-					$(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
-			}
-			
-			if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
-				if(i.overflowX[0].offsetWidth - (ui.position.left - i.overflowX[0].scrollLeft + i.clickOffset.left) < o.scrollSensitivity)
-					i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
-				if((ui.position.top - i.overflowX[0].scrollLeft + i.clickOffset.left) < o.scrollSensitivity)
-					i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;				
-			} else {
-				if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
-					$(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
-				if($(window).width() - (e.pageX - $(document).scrollLeft()) < o.scrollSensitivity)
-					$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
-			}
-			
-			//ui.instance.recallOffset(e);
-			i.offset = {
-				left: i.mouse.start.left - i.originalPosition.left + (i.overflowXstart !== undefined ? i.overflowXstart - i.overflowX[0].scrollLeft : 0),
-				top: i.mouse.start.top - i.originalPosition.top + (i.overflowYstart !== undefined ? i.overflowYstart - i.overflowX[0].scrollTop : 0)
-			};
-
-		}
-	});
+		
+	}
+});
 
 })(jQuery);
diff --git a/wp-includes/js/jquery/ui.tabs.js b/wp-includes/js/jquery/ui.tabs.js
index 34372d9cda..a675b4de78 100644
--- a/wp-includes/js/jquery/ui.tabs.js
+++ b/wp-includes/js/jquery/ui.tabs.js
@@ -13,583 +13,583 @@
  * Revision: $Id: ui.tabs.js 5641 2008-05-20 02:53:23Z scott.gonzalez $
  */
 ;(function($) {
-	
-	$.widget("ui.tabs", {
-		init: function() {
-			this.options.event += '.tabs'; // namespace event
-			
-			// create tabs
-			this.tabify(true);
-		},
-		setData: function(key, value) {
-			if ((/^selected/).test(key))
-				this.select(value);
-			else {
-				this.options[key] = value;
-				this.tabify();
-			}
-		},
-		length: function() {
-			return this.$tabs.length;
-		},
-		tabId: function(a) {
-			return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '')
-				|| this.options.idPrefix + $.data(a);
-		},
-		ui: function(tab, panel) {
-			return {
-				instance: this,
-				options: this.options,
-				tab: tab,
-				panel: panel
-			};
-		},
-		tabify: function(init) {
 
-			this.$lis = $('li:has(a[href])', this.element);
-			this.$tabs = this.$lis.map(function() { return $('a', this)[0]; });
-			this.$panels = $([]);
+$.widget("ui.tabs", {
+	init: function() {
+		this.options.event += '.tabs'; // namespace event
+		
+		// create tabs
+		this.tabify(true);
+	},
+	setData: function(key, value) {
+		if ((/^selected/).test(key))
+			this.select(value);
+		else {
+			this.options[key] = value;
+			this.tabify();
+		}
+	},
+	length: function() {
+		return this.$tabs.length;
+	},
+	tabId: function(a) {
+		return a.title && a.title.replace(/\s/g, '_').replace(/[^A-Za-z0-9\-_:\.]/g, '')
+			|| this.options.idPrefix + $.data(a);
+	},
+	ui: function(tab, panel) {
+		return {
+			instance: this,
+			options: this.options,
+			tab: tab,
+			panel: panel
+		};
+	},
+	tabify: function(init) {
 
-			var self = this, o = this.options;
+		this.$lis = $('li:has(a[href])', this.element);
+		this.$tabs = this.$lis.map(function() { return $('a', this)[0]; });
+		this.$panels = $([]);
 
-			this.$tabs.each(function(i, a) {
-				// inline tab
-				if (a.hash && a.hash.replace('#', '')) // Safari 2 reports '#' for an empty hash
-					self.$panels = self.$panels.add(a.hash);
-				// remote tab
-				else if ($(a).attr('href') != '#') { // prevent loading the page itself if href is just "#"
-					$.data(a, 'href.tabs', a.href); // required for restore on destroy
-					$.data(a, 'load.tabs', a.href); // mutable
-					var id = self.tabId(a);
-					a.href = '#' + id;
-					var $panel = $('#' + id);
-					if (!$panel.length) {
-						$panel = $(o.panelTemplate).attr('id', id).addClass(o.panelClass)
-							.insertAfter( self.$panels[i - 1] || self.element );
-						$panel.data('destroy.tabs', true);
-					}
-					self.$panels = self.$panels.add( $panel );
+		var self = this, o = this.options;
+
+		this.$tabs.each(function(i, a) {
+			// inline tab
+			if (a.hash && a.hash.replace('#', '')) // Safari 2 reports '#' for an empty hash
+				self.$panels = self.$panels.add(a.hash);
+			// remote tab
+			else if ($(a).attr('href') != '#') { // prevent loading the page itself if href is just "#"
+				$.data(a, 'href.tabs', a.href); // required for restore on destroy
+				$.data(a, 'load.tabs', a.href); // mutable
+				var id = self.tabId(a);
+				a.href = '#' + id;
+				var $panel = $('#' + id);
+				if (!$panel.length) {
+					$panel = $(o.panelTemplate).attr('id', id).addClass(o.panelClass)
+						.insertAfter( self.$panels[i - 1] || self.element );
+					$panel.data('destroy.tabs', true);
 				}
-				// invalid tab href
-				else
-					o.disabled.push(i + 1);
+				self.$panels = self.$panels.add( $panel );
+			}
+			// invalid tab href
+			else
+				o.disabled.push(i + 1);
+		});
+
+		if (init) {
+
+			// attach necessary classes for styling if not present
+			this.element.addClass(o.navClass);
+			this.$panels.each(function() {
+				var $this = $(this);
+				$this.addClass(o.panelClass);
 			});
 
-			if (init) {
-
-				// attach necessary classes for styling if not present
-				this.element.addClass(o.navClass);
-				this.$panels.each(function() {
-					var $this = $(this);
-					$this.addClass(o.panelClass);
-				});
-
-				// Selected tab
-				// use "selected" option or try to retrieve:
-				// 1. from fragment identifier in url
-				// 2. from cookie
-				// 3. from selected class attribute on <li>
-				if (o.selected === undefined) {
-					if (location.hash) {
-						this.$tabs.each(function(i, a) {
-							if (a.hash == location.hash) {
-								o.selected = i;
-								// prevent page scroll to fragment
-								if ($.browser.msie || $.browser.opera) { // && !o.remote
-									var $toShow = $(location.hash), toShowId = $toShow.attr('id');
-									$toShow.attr('id', '');
-									setTimeout(function() {
-										$toShow.attr('id', toShowId); // restore id
-									}, 500);
-								}
-								scrollTo(0, 0);
-								return false; // break
+			// Selected tab
+			// use "selected" option or try to retrieve:
+			// 1. from fragment identifier in url
+			// 2. from cookie
+			// 3. from selected class attribute on <li>
+			if (o.selected === undefined) {
+				if (location.hash) {
+					this.$tabs.each(function(i, a) {
+						if (a.hash == location.hash) {
+							o.selected = i;
+							// prevent page scroll to fragment
+							if ($.browser.msie || $.browser.opera) { // && !o.remote
+								var $toShow = $(location.hash), toShowId = $toShow.attr('id');
+								$toShow.attr('id', '');
+								setTimeout(function() {
+									$toShow.attr('id', toShowId); // restore id
+								}, 500);
 							}
-						});
-					}
-					else if (o.cookie) {
-						var index = parseInt($.cookie('ui-tabs' + $.data(self.element)),10);
-						if (index && self.$tabs[index])
-							o.selected = index;
-					}
-					else if (self.$lis.filter('.' + o.selectedClass).length)
-						o.selected = self.$lis.index( self.$lis.filter('.' + o.selectedClass)[0] );
+							scrollTo(0, 0);
+							return false; // break
+						}
+					});
 				}
-				o.selected = o.selected === null || o.selected !== undefined ? o.selected : 0; // first tab selected by default
-
-				// Take disabling tabs via class attribute from HTML
-				// into account and update option properly.
-				// A selected tab cannot become disabled.
-				o.disabled = $.unique(o.disabled.concat(
-					$.map(this.$lis.filter('.' + o.disabledClass),
-						function(n, i) { return self.$lis.index(n); } )
-				)).sort();
-				if ($.inArray(o.selected, o.disabled) != -1)
-					o.disabled.splice($.inArray(o.selected, o.disabled), 1);
-				
-				// highlight selected tab
-				this.$panels.addClass(o.hideClass);
-				this.$lis.removeClass(o.selectedClass);
-				if (o.selected !== null) {
-					this.$panels.eq(o.selected).show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before
-					this.$lis.eq(o.selected).addClass(o.selectedClass);
-					
-					// seems to be expected behavior that the show callback is fired
-					var onShow = function() {
-						$(self.element).triggerHandler('tabsshow',
-							[self.ui(self.$tabs[o.selected], self.$panels[o.selected])], o.show);
-					}; 
-
-					// load if remote tab
-					if ($.data(this.$tabs[o.selected], 'load.tabs'))
-						this.load(o.selected, onShow);
-					// just trigger show event
-					else
-						onShow();
-					
+				else if (o.cookie) {
+					var index = parseInt($.cookie('ui-tabs' + $.data(self.element)),10);
+					if (index && self.$tabs[index])
+						o.selected = index;
 				}
-				
-				// clean up to avoid memory leaks in certain versions of IE 6
-				$(window).bind('unload', function() {
-					self.$tabs.unbind('.tabs');
-					self.$lis = self.$tabs = self.$panels = null;
-				});
-
+				else if (self.$lis.filter('.' + o.selectedClass).length)
+					o.selected = self.$lis.index( self.$lis.filter('.' + o.selectedClass)[0] );
 			}
+			o.selected = o.selected === null || o.selected !== undefined ? o.selected : 0; // first tab selected by default
 
-			// disable tabs
-			for (var i = 0, li; li = this.$lis[i]; i++)
-				$(li)[$.inArray(i, o.disabled) != -1 && !$(li).hasClass(o.selectedClass) ? 'addClass' : 'removeClass'](o.disabledClass);
-
-			// reset cache if switching from cached to not cached
-			if (o.cache === false)
-				this.$tabs.removeData('cache.tabs');
+			// Take disabling tabs via class attribute from HTML
+			// into account and update option properly.
+			// A selected tab cannot become disabled.
+			o.disabled = $.unique(o.disabled.concat(
+				$.map(this.$lis.filter('.' + o.disabledClass),
+					function(n, i) { return self.$lis.index(n); } )
+			)).sort();
+			if ($.inArray(o.selected, o.disabled) != -1)
+				o.disabled.splice($.inArray(o.selected, o.disabled), 1);
 			
-			// set up animations
-			var hideFx, showFx, baseFx = { 'min-width': 0, duration: 1 }, baseDuration = 'normal';
-			if (o.fx && o.fx.constructor == Array)
-				hideFx = o.fx[0] || baseFx, showFx = o.fx[1] || baseFx;
-			else
-				hideFx = showFx = o.fx || baseFx;
-
-			// reset some styles to maintain print style sheets etc.
-			var resetCSS = { display: '', overflow: '', height: '' };
-			if (!$.browser.msie) // not in IE to prevent ClearType font issue
-				resetCSS.opacity = '';
-
-			// Hide a tab, animation prevents browser scrolling to fragment,
-			// $show is optional.
-			function hideTab(clicked, $hide, $show) {
-				$hide.animate(hideFx, hideFx.duration || baseDuration, function() { //
-					$hide.addClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
-					if ($.browser.msie && hideFx.opacity)
-						$hide[0].style.filter = '';
-					if ($show)
-						showTab(clicked, $show, $hide);
-				});
-			}
-
-			// Show a tab, animation prevents browser scrolling to fragment,
-			// $hide is optional.
-			function showTab(clicked, $show, $hide) {
-				if (showFx === baseFx)
-					$show.css('display', 'block'); // prevent occasionally occuring flicker in Firefox cause by gap between showing and hiding the tab panels
-				$show.animate(showFx, showFx.duration || baseDuration, function() {
-					$show.removeClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
-					if ($.browser.msie && showFx.opacity)
-						$show[0].style.filter = '';
-
-					// callback
+			// highlight selected tab
+			this.$panels.addClass(o.hideClass);
+			this.$lis.removeClass(o.selectedClass);
+			if (o.selected !== null) {
+				this.$panels.eq(o.selected).show().removeClass(o.hideClass); // use show and remove class to show in any case no matter how it has been hidden before
+				this.$lis.eq(o.selected).addClass(o.selectedClass);
+				
+				// seems to be expected behavior that the show callback is fired
+				var onShow = function() {
 					$(self.element).triggerHandler('tabsshow',
-						[self.ui(clicked, $show[0])], o.show);
+						[self.ui(self.$tabs[o.selected], self.$panels[o.selected])], o.show);
+				}; 
 
-				});
+				// load if remote tab
+				if ($.data(this.$tabs[o.selected], 'load.tabs'))
+					this.load(o.selected, onShow);
+				// just trigger show event
+				else
+					onShow();
+				
+			}
+			
+			// clean up to avoid memory leaks in certain versions of IE 6
+			$(window).bind('unload', function() {
+				self.$tabs.unbind('.tabs');
+				self.$lis = self.$tabs = self.$panels = null;
+			});
+
+		}
+
+		// disable tabs
+		for (var i = 0, li; li = this.$lis[i]; i++)
+			$(li)[$.inArray(i, o.disabled) != -1 && !$(li).hasClass(o.selectedClass) ? 'addClass' : 'removeClass'](o.disabledClass);
+
+		// reset cache if switching from cached to not cached
+		if (o.cache === false)
+			this.$tabs.removeData('cache.tabs');
+		
+		// set up animations
+		var hideFx, showFx, baseFx = { 'min-width': 0, duration: 1 }, baseDuration = 'normal';
+		if (o.fx && o.fx.constructor == Array)
+			hideFx = o.fx[0] || baseFx, showFx = o.fx[1] || baseFx;
+		else
+			hideFx = showFx = o.fx || baseFx;
+
+		// reset some styles to maintain print style sheets etc.
+		var resetCSS = { display: '', overflow: '', height: '' };
+		if (!$.browser.msie) // not in IE to prevent ClearType font issue
+			resetCSS.opacity = '';
+
+		// Hide a tab, animation prevents browser scrolling to fragment,
+		// $show is optional.
+		function hideTab(clicked, $hide, $show) {
+			$hide.animate(hideFx, hideFx.duration || baseDuration, function() { //
+				$hide.addClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
+				if ($.browser.msie && hideFx.opacity)
+					$hide[0].style.filter = '';
+				if ($show)
+					showTab(clicked, $show, $hide);
+			});
+		}
+
+		// Show a tab, animation prevents browser scrolling to fragment,
+		// $hide is optional.
+		function showTab(clicked, $show, $hide) {
+			if (showFx === baseFx)
+				$show.css('display', 'block'); // prevent occasionally occuring flicker in Firefox cause by gap between showing and hiding the tab panels
+			$show.animate(showFx, showFx.duration || baseDuration, function() {
+				$show.removeClass(o.hideClass).css(resetCSS); // maintain flexible height and accessibility in print etc.
+				if ($.browser.msie && showFx.opacity)
+					$show[0].style.filter = '';
+
+				// callback
+				$(self.element).triggerHandler('tabsshow',
+					[self.ui(clicked, $show[0])], o.show);
+
+			});
+		}
+
+		// switch a tab
+		function switchTab(clicked, $li, $hide, $show) {
+			/*if (o.bookmarkable && trueClick) { // add to history only if true click occured, not a triggered click
+				$.ajaxHistory.update(clicked.hash);
+			}*/
+			$li.addClass(o.selectedClass)
+				.siblings().removeClass(o.selectedClass);
+			hideTab(clicked, $hide, $show);
+		}
+
+		// attach tab event handler, unbind to avoid duplicates from former tabifying...
+		this.$tabs.unbind('.tabs').bind(o.event, function() {
+
+			//var trueClick = e.clientX; // add to history only if true click occured, not a triggered click
+			var $li = $(this).parents('li:eq(0)'),
+				$hide = self.$panels.filter(':visible'),
+				$show = $(this.hash);
+
+			// If tab is already selected and not unselectable or tab disabled or 
+			// or is already loading or click callback returns false stop here.
+			// Check if click handler returns false last so that it is not executed
+			// for a disabled or loading tab!
+			if (($li.hasClass(o.selectedClass) && !o.unselect)
+				|| $li.hasClass(o.disabledClass) 
+				|| $(this).hasClass(o.loadingClass)
+				|| $(self.element).triggerHandler('tabsselect', [self.ui(this, $show[0])], o.select) === false
+				) {
+				this.blur();
+				return false;
 			}
 
-			// switch a tab
-			function switchTab(clicked, $li, $hide, $show) {
-				/*if (o.bookmarkable && trueClick) { // add to history only if true click occured, not a triggered click
-					$.ajaxHistory.update(clicked.hash);
-				}*/
-				$li.addClass(o.selectedClass)
-					.siblings().removeClass(o.selectedClass);
-				hideTab(clicked, $hide, $show);
-			}
+			self.options.selected = self.$tabs.index(this);
 
-			// attach tab event handler, unbind to avoid duplicates from former tabifying...
-			this.$tabs.unbind('.tabs').bind(o.event, function() {
-
-				//var trueClick = e.clientX; // add to history only if true click occured, not a triggered click
-				var $li = $(this).parents('li:eq(0)'),
-					$hide = self.$panels.filter(':visible'),
-					$show = $(this.hash);
-
-				// If tab is already selected and not unselectable or tab disabled or 
-				// or is already loading or click callback returns false stop here.
-				// Check if click handler returns false last so that it is not executed
-				// for a disabled or loading tab!
-				if (($li.hasClass(o.selectedClass) && !o.unselect)
-					|| $li.hasClass(o.disabledClass) 
-					|| $(this).hasClass(o.loadingClass)
-					|| $(self.element).triggerHandler('tabsselect', [self.ui(this, $show[0])], o.select) === false
-					) {
+			// if tab may be closed
+			if (o.unselect) {
+				if ($li.hasClass(o.selectedClass)) {
+					self.options.selected = null;
+					$li.removeClass(o.selectedClass);
+					self.$panels.stop();
+					hideTab(this, $hide);
+					this.blur();
+					return false;
+				} else if (!$hide.length) {
+					self.$panels.stop();
+					var a = this;
+					self.load(self.$tabs.index(this), function() {
+						$li.addClass(o.selectedClass).addClass(o.unselectClass);
+						showTab(a, $show);
+					});
 					this.blur();
 					return false;
 				}
+			}
 
-				self.options.selected = self.$tabs.index(this);
+			if (o.cookie)
+				$.cookie('ui-tabs' + $.data(self.element), self.options.selected, o.cookie);
 
-				// if tab may be closed
-				if (o.unselect) {
-					if ($li.hasClass(o.selectedClass)) {
-						self.options.selected = null;
-						$li.removeClass(o.selectedClass);
-						self.$panels.stop();
-						hideTab(this, $hide);
-						this.blur();
-						return false;
-					} else if (!$hide.length) {
-						self.$panels.stop();
-						var a = this;
-						self.load(self.$tabs.index(this), function() {
-							$li.addClass(o.selectedClass).addClass(o.unselectClass);
-							showTab(a, $show);
-						});
-						this.blur();
-						return false;
-					}
-				}
+			// stop possibly running animations
+			self.$panels.stop();
 
-				if (o.cookie)
-					$.cookie('ui-tabs' + $.data(self.element), self.options.selected, o.cookie);
+			// show new tab
+			if ($show.length) {
 
-				// stop possibly running animations
-				self.$panels.stop();
-
-				// show new tab
-				if ($show.length) {
-
-					// prevent scrollbar scrolling to 0 and than back in IE7, happens only if bookmarking/history is enabled
-					/*if ($.browser.msie && o.bookmarkable) {
-						var showId = this.hash.replace('#', '');
-						$show.attr('id', '');
-						setTimeout(function() {
-							$show.attr('id', showId); // restore id
-						}, 0);
-					}*/
-
-					var a = this;
-					self.load(self.$tabs.index(this), $hide.length ? 
-						function() {
-							switchTab(a, $li, $hide, $show);
-						} :
-						function() {
-							$li.addClass(o.selectedClass);
-							showTab(a, $show);
-						}
-					);
-
-					// Set scrollbar to saved position - need to use timeout with 0 to prevent browser scroll to target of hash
-					/*var scrollX = window.pageXOffset || document.documentElement && document.documentElement.scrollLeft || document.body.scrollLeft || 0;
-					var scrollY = window.pageYOffset || document.documentElement && document.documentElement.scrollTop || document.body.scrollTop || 0;
+				// prevent scrollbar scrolling to 0 and than back in IE7, happens only if bookmarking/history is enabled
+				/*if ($.browser.msie && o.bookmarkable) {
+					var showId = this.hash.replace('#', '');
+					$show.attr('id', '');
 					setTimeout(function() {
-						scrollTo(scrollX, scrollY);
-					}, 0);*/
+						$show.attr('id', showId); // restore id
+					}, 0);
+				}*/
 
-				} else
-					throw 'jQuery UI Tabs: Mismatching fragment identifier.';
-
-				// Prevent IE from keeping other link focussed when using the back button
-				// and remove dotted border from clicked link. This is controlled in modern
-				// browsers via CSS, also blur removes focus from address bar in Firefox
-				// which can become a usability and annoying problem with tabsRotate.
-				if ($.browser.msie)
-					this.blur();
-
-				//return o.bookmarkable && !!trueClick; // convert trueClick == undefined to Boolean required in IE
-				return false;
-
-			});
-
-			// disable click if event is configured to something else
-			if (!(/^click/).test(o.event))
-				this.$tabs.bind('click.tabs', function() { return false; });
-
-		},
-		add: function(url, label, index) {
-			if (index == undefined) 
-				index = this.$tabs.length; // append by default
-
-			var o = this.options;
-			var $li = $(o.tabTemplate.replace(/#\{href\}/, url).replace(/#\{label\}/, label));
-			$li.data('destroy.tabs', true);
-
-			var id = url.indexOf('#') == 0 ? url.replace('#', '') : this.tabId( $('a:first-child', $li)[0] );
-
-			// try to find an existing element before creating a new one
-			var $panel = $('#' + id);
-			if (!$panel.length) {
-				$panel = $(o.panelTemplate).attr('id', id)
-					.addClass(o.hideClass)
-					.data('destroy.tabs', true);
-			}
-			$panel.addClass(o.panelClass);
-			if (index >= this.$lis.length) {
-				$li.appendTo(this.element);
-				$panel.appendTo(this.element[0].parentNode);
-			} else {
-				$li.insertBefore(this.$lis[index]);
-				$panel.insertBefore(this.$panels[index]);
-			}
-			
-			o.disabled = $.map(o.disabled,
-				function(n, i) { return n >= index ? ++n : n });
-				
-			this.tabify();
-
-			if (this.$tabs.length == 1) {
-				$li.addClass(o.selectedClass);
-				$panel.removeClass(o.hideClass);
-				var href = $.data(this.$tabs[0], 'load.tabs');
-				if (href)
-					this.load(index, href);
-			}
-
-			// callback
-			this.element.triggerHandler('tabsadd',
-				[this.ui(this.$tabs[index], this.$panels[index])], o.add
-			);
-		},
-		remove: function(index) {
-			var o = this.options, $li = this.$lis.eq(index).remove(),
-				$panel = this.$panels.eq(index).remove();
-
-			// If selected tab was removed focus tab to the right or
-			// in case the last tab was removed the tab to the left.
-			if ($li.hasClass(o.selectedClass) && this.$tabs.length > 1)
-				this.select(index + (index + 1 < this.$tabs.length ? 1 : -1));
-
-			o.disabled = $.map($.grep(o.disabled, function(n, i) { return n != index; }),
-				function(n, i) { return n >= index ? --n : n });
-
-			this.tabify();
-
-			// callback
-			this.element.triggerHandler('tabsremove',
-				[this.ui($li.find('a')[0], $panel[0])], o.remove
-			);
-		},
-		enable: function(index) {
-			var o = this.options;
-			if ($.inArray(index, o.disabled) == -1)
-				return;
-				
-			var $li = this.$lis.eq(index).removeClass(o.disabledClass);
-			if ($.browser.safari) { // fix disappearing tab (that used opacity indicating disabling) after enabling in Safari 2...
-				$li.css('display', 'inline-block');
-				setTimeout(function() {
-					$li.css('display', 'block');
-				}, 0);
-			}
-
-			o.disabled = $.grep(o.disabled, function(n, i) { return n != index; });
-
-			// callback
-			this.element.triggerHandler('tabsenable',
-				[this.ui(this.$tabs[index], this.$panels[index])], o.enable
-			);
-
-		},
-		disable: function(index) {
-			var self = this, o = this.options;
-			if (index != o.selected) { // cannot disable already selected tab
-				this.$lis.eq(index).addClass(o.disabledClass);
-
-				o.disabled.push(index);
-				o.disabled.sort();
-
-				// callback
-				this.element.triggerHandler('tabsdisable',
-					[this.ui(this.$tabs[index], this.$panels[index])], o.disable
+				var a = this;
+				self.load(self.$tabs.index(this), $hide.length ? 
+					function() {
+						switchTab(a, $li, $hide, $show);
+					} :
+					function() {
+						$li.addClass(o.selectedClass);
+						showTab(a, $show);
+					}
 				);
-			}
-		},
-		select: function(index) {
-			if (typeof index == 'string')
-				index = this.$tabs.index( this.$tabs.filter('[href$=' + index + ']')[0] );
-			this.$tabs.eq(index).trigger(this.options.event);
-		},
-		load: function(index, callback) { // callback is for internal usage only
-			
-			var self = this, o = this.options, $a = this.$tabs.eq(index), a = $a[0],
-					bypassCache = callback == undefined || callback === false, url = $a.data('load.tabs');
 
-			callback = callback || function() {};
-			
-			// no remote or from cache - just finish with callback
-			if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
-				callback();
-				return;
-			}
+				// Set scrollbar to saved position - need to use timeout with 0 to prevent browser scroll to target of hash
+				/*var scrollX = window.pageXOffset || document.documentElement && document.documentElement.scrollLeft || document.body.scrollLeft || 0;
+				var scrollY = window.pageYOffset || document.documentElement && document.documentElement.scrollTop || document.body.scrollTop || 0;
+				setTimeout(function() {
+					scrollTo(scrollX, scrollY);
+				}, 0);*/
 
-			// load remote from here on
-			
-			var inner = function(parent) {
-				var $parent = $(parent), $inner = $parent.find('*:last');
-				return $inner.length && $inner || $parent;
-			};
-			var cleanup = function() {
-				self.$tabs.filter('.' + o.loadingClass).removeClass(o.loadingClass)
-							.each(function() {
-								if (o.spinner)
-									inner(this).parent().html(inner(this).data('label.tabs'));
-							});
-				self.xhr = null;
-			};
-			
-			if (o.spinner) {
-				var label = inner(a).html();
-				inner(a).wrapInner('<em></em>')
-					.find('em').data('label.tabs', label).html(o.spinner);
-			}
+			} else
+				throw 'jQuery UI Tabs: Mismatching fragment identifier.';
 
-			var ajaxOptions = $.extend({}, o.ajaxOptions, {
-				url: url,
-				success: function(r, s) {
-					$(a.hash).html(r);
-					cleanup();
-					
-					if (o.cache)
-						$.data(a, 'cache.tabs', true); // if loaded once do not load them again
+			// Prevent IE from keeping other link focussed when using the back button
+			// and remove dotted border from clicked link. This is controlled in modern
+			// browsers via CSS, also blur removes focus from address bar in Firefox
+			// which can become a usability and annoying problem with tabsRotate.
+			if ($.browser.msie)
+				this.blur();
 
-					// callbacks
-					$(self.element).triggerHandler('tabsload',
-						[self.ui(self.$tabs[index], self.$panels[index])], o.load
-					);
-					o.ajaxOptions.success && o.ajaxOptions.success(r, s);
-					
-					// This callback is required because the switch has to take
-					// place after loading has completed. Call last in order to 
-					// fire load before show callback...
-					callback();
-				}
-			});
-			if (this.xhr) {
-				// terminate pending requests from other tabs and restore tab label
-				this.xhr.abort();
-				cleanup();
-			}
-			$a.addClass(o.loadingClass);
-			setTimeout(function() { // timeout is again required in IE, "wait" for id being restored
-				self.xhr = $.ajax(ajaxOptions);
-			}, 0);
+			//return o.bookmarkable && !!trueClick; // convert trueClick == undefined to Boolean required in IE
+			return false;
 
-		},
-		url: function(index, url) {
-			this.$tabs.eq(index).removeData('cache.tabs').data('load.tabs', url);
-		},
-		destroy: function() {
-			var o = this.options;
-			this.element.unbind('.tabs')
-				.removeClass(o.navClass).removeData('tabs');
-			this.$tabs.each(function() {
-				var href = $.data(this, 'href.tabs');
-				if (href)
-					this.href = href;
-				var $this = $(this).unbind('.tabs');
-				$.each(['href', 'load', 'cache'], function(i, prefix) {
-					$this.removeData(prefix + '.tabs');
-				});
-			});
-			this.$lis.add(this.$panels).each(function() {
-				if ($.data(this, 'destroy.tabs'))
-					$(this).remove();
-				else
-					$(this).removeClass([o.selectedClass, o.unselectClass,
-						o.disabledClass, o.panelClass, o.hideClass].join(' '));
-			});
+		});
+
+		// disable click if event is configured to something else
+		if (!(/^click/).test(o.event))
+			this.$tabs.bind('click.tabs', function() { return false; });
+
+	},
+	add: function(url, label, index) {
+		if (index == undefined) 
+			index = this.$tabs.length; // append by default
+
+		var o = this.options;
+		var $li = $(o.tabTemplate.replace(/#\{href\}/g, url).replace(/#\{label\}/g, label));
+		$li.data('destroy.tabs', true);
+
+		var id = url.indexOf('#') == 0 ? url.replace('#', '') : this.tabId( $('a:first-child', $li)[0] );
+
+		// try to find an existing element before creating a new one
+		var $panel = $('#' + id);
+		if (!$panel.length) {
+			$panel = $(o.panelTemplate).attr('id', id)
+				.addClass(o.hideClass)
+				.data('destroy.tabs', true);
 		}
-	});
-	
-	$.ui.tabs.defaults = {
-		// basic setup
-		unselect: false,
-		event: 'click',
-		disabled: [],
-		cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
-		// TODO history: false,
+		$panel.addClass(o.panelClass);
+		if (index >= this.$lis.length) {
+			$li.appendTo(this.element);
+			$panel.appendTo(this.element[0].parentNode);
+		} else {
+			$li.insertBefore(this.$lis[index]);
+			$panel.insertBefore(this.$panels[index]);
+		}
+		
+		o.disabled = $.map(o.disabled,
+			function(n, i) { return n >= index ? ++n : n });
+			
+		this.tabify();
 
-		// Ajax
-		spinner: 'Loading&#8230;',
-		cache: false,
-		idPrefix: 'ui-tabs-',
-		ajaxOptions: {},
+		if (this.$tabs.length == 1) {
+			$li.addClass(o.selectedClass);
+			$panel.removeClass(o.hideClass);
+			var href = $.data(this.$tabs[0], 'load.tabs');
+			if (href)
+				this.load(index, href);
+		}
 
-		// animations
-		fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+		// callback
+		this.element.triggerHandler('tabsadd',
+			[this.ui(this.$tabs[index], this.$panels[index])], o.add
+		);
+	},
+	remove: function(index) {
+		var o = this.options, $li = this.$lis.eq(index).remove(),
+			$panel = this.$panels.eq(index).remove();
 
-		// templates
-		tabTemplate: '<li><a href="#{href}"><span>#{label}</span></a></li>',
-		panelTemplate: '<div></div>',
+		// If selected tab was removed focus tab to the right or
+		// in case the last tab was removed the tab to the left.
+		if ($li.hasClass(o.selectedClass) && this.$tabs.length > 1)
+			this.select(index + (index + 1 < this.$tabs.length ? 1 : -1));
 
-		// CSS classes
-		navClass: 'ui-tabs-nav',
-		selectedClass: 'ui-tabs-selected',
-		unselectClass: 'ui-tabs-unselect',
-		disabledClass: 'ui-tabs-disabled',
-		panelClass: 'ui-tabs-panel',
-		hideClass: 'ui-tabs-hide',
-		loadingClass: 'ui-tabs-loading'
-	};
-	
-	$.ui.tabs.getter = "length";
+		o.disabled = $.map($.grep(o.disabled, function(n, i) { return n != index; }),
+			function(n, i) { return n >= index ? --n : n });
+
+		this.tabify();
+
+		// callback
+		this.element.triggerHandler('tabsremove',
+			[this.ui($li.find('a')[0], $panel[0])], o.remove
+		);
+	},
+	enable: function(index) {
+		var o = this.options;
+		if ($.inArray(index, o.disabled) == -1)
+			return;
+			
+		var $li = this.$lis.eq(index).removeClass(o.disabledClass);
+		if ($.browser.safari) { // fix disappearing tab (that used opacity indicating disabling) after enabling in Safari 2...
+			$li.css('display', 'inline-block');
+			setTimeout(function() {
+				$li.css('display', 'block');
+			}, 0);
+		}
+
+		o.disabled = $.grep(o.disabled, function(n, i) { return n != index; });
+
+		// callback
+		this.element.triggerHandler('tabsenable',
+			[this.ui(this.$tabs[index], this.$panels[index])], o.enable
+		);
+
+	},
+	disable: function(index) {
+		var self = this, o = this.options;
+		if (index != o.selected) { // cannot disable already selected tab
+			this.$lis.eq(index).addClass(o.disabledClass);
+
+			o.disabled.push(index);
+			o.disabled.sort();
+
+			// callback
+			this.element.triggerHandler('tabsdisable',
+				[this.ui(this.$tabs[index], this.$panels[index])], o.disable
+			);
+		}
+	},
+	select: function(index) {
+		if (typeof index == 'string')
+			index = this.$tabs.index( this.$tabs.filter('[href$=' + index + ']')[0] );
+		this.$tabs.eq(index).trigger(this.options.event);
+	},
+	load: function(index, callback) { // callback is for internal usage only
+		
+		var self = this, o = this.options, $a = this.$tabs.eq(index), a = $a[0],
+				bypassCache = callback == undefined || callback === false, url = $a.data('load.tabs');
+
+		callback = callback || function() {};
+		
+		// no remote or from cache - just finish with callback
+		if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
+			callback();
+			return;
+		}
+
+		// load remote from here on
+		
+		var inner = function(parent) {
+			var $parent = $(parent), $inner = $parent.find('*:last');
+			return $inner.length && $inner || $parent;
+		};
+		var cleanup = function() {
+			self.$tabs.filter('.' + o.loadingClass).removeClass(o.loadingClass)
+						.each(function() {
+							if (o.spinner)
+								inner(this).parent().html(inner(this).data('label.tabs'));
+						});
+			self.xhr = null;
+		};
+		
+		if (o.spinner) {
+			var label = inner(a).html();
+			inner(a).wrapInner('<em></em>')
+				.find('em').data('label.tabs', label).html(o.spinner);
+		}
+
+		var ajaxOptions = $.extend({}, o.ajaxOptions, {
+			url: url,
+			success: function(r, s) {
+				$(a.hash).html(r);
+				cleanup();
+				
+				if (o.cache)
+					$.data(a, 'cache.tabs', true); // if loaded once do not load them again
+
+				// callbacks
+				$(self.element).triggerHandler('tabsload',
+					[self.ui(self.$tabs[index], self.$panels[index])], o.load
+				);
+				o.ajaxOptions.success && o.ajaxOptions.success(r, s);
+				
+				// This callback is required because the switch has to take
+				// place after loading has completed. Call last in order to 
+				// fire load before show callback...
+				callback();
+			}
+		});
+		if (this.xhr) {
+			// terminate pending requests from other tabs and restore tab label
+			this.xhr.abort();
+			cleanup();
+		}
+		$a.addClass(o.loadingClass);
+		setTimeout(function() { // timeout is again required in IE, "wait" for id being restored
+			self.xhr = $.ajax(ajaxOptions);
+		}, 0);
+
+	},
+	url: function(index, url) {
+		this.$tabs.eq(index).removeData('cache.tabs').data('load.tabs', url);
+	},
+	destroy: function() {
+		var o = this.options;
+		this.element.unbind('.tabs')
+			.removeClass(o.navClass).removeData('tabs');
+		this.$tabs.each(function() {
+			var href = $.data(this, 'href.tabs');
+			if (href)
+				this.href = href;
+			var $this = $(this).unbind('.tabs');
+			$.each(['href', 'load', 'cache'], function(i, prefix) {
+				$this.removeData(prefix + '.tabs');
+			});
+		});
+		this.$lis.add(this.$panels).each(function() {
+			if ($.data(this, 'destroy.tabs'))
+				$(this).remove();
+			else
+				$(this).removeClass([o.selectedClass, o.unselectClass,
+					o.disabledClass, o.panelClass, o.hideClass].join(' '));
+		});
+	}
+});
+
+$.ui.tabs.defaults = {
+	// basic setup
+	unselect: false,
+	event: 'click',
+	disabled: [],
+	cookie: null, // e.g. { expires: 7, path: '/', domain: 'jquery.com', secure: true }
+	// TODO history: false,
+
+	// Ajax
+	spinner: 'Loading&#8230;',
+	cache: false,
+	idPrefix: 'ui-tabs-',
+	ajaxOptions: {},
+
+	// animations
+	fx: null, // e.g. { height: 'toggle', opacity: 'toggle', duration: 200 }
+
+	// templates
+	tabTemplate: '<li><a href="#{href}"><span>#{label}</span></a></li>',
+	panelTemplate: '<div></div>',
+
+	// CSS classes
+	navClass: 'ui-tabs-nav',
+	selectedClass: 'ui-tabs-selected',
+	unselectClass: 'ui-tabs-unselect',
+	disabledClass: 'ui-tabs-disabled',
+	panelClass: 'ui-tabs-panel',
+	hideClass: 'ui-tabs-hide',
+	loadingClass: 'ui-tabs-loading'
+};
+
+$.ui.tabs.getter = "length";
 
 /*
  * Tabs Extensions
  */
 
-	/*
-	 * Rotate
-	 */
-	$.extend($.ui.tabs.prototype, {
-		rotation: null,
-		rotate: function(ms, continuing) {
-			
-			continuing = continuing || false;
-			
-			var self = this, t = this.options.selected;
-			
-			function start() {
-				self.rotation = setInterval(function() {
-					t = ++t < self.$tabs.length ? t : 0;
-					self.select(t);
-				}, ms); 
-			}
-			
-			function stop(e) {
-				if (!e || e.clientX) { // only in case of a true click
-					clearInterval(self.rotation);
-				}
-			}
-			
-			// start interval
-			if (ms) {
-				start();
-				if (!continuing)
-					this.$tabs.bind(this.options.event, stop);
-				else
-					this.$tabs.bind(this.options.event, function() {
-						stop();
-						t = self.options.selected;
-						start();
-					});
-			}
-			// stop interval
-			else {
-				stop();
-				this.$tabs.unbind(this.options.event, stop);
+/*
+ * Rotate
+ */
+$.extend($.ui.tabs.prototype, {
+	rotation: null,
+	rotate: function(ms, continuing) {
+		
+		continuing = continuing || false;
+		
+		var self = this, t = this.options.selected;
+		
+		function start() {
+			self.rotation = setInterval(function() {
+				t = ++t < self.$tabs.length ? t : 0;
+				self.select(t);
+			}, ms); 
+		}
+		
+		function stop(e) {
+			if (!e || e.clientX) { // only in case of a true click
+				clearInterval(self.rotation);
 			}
 		}
-	});
+		
+		// start interval
+		if (ms) {
+			start();
+			if (!continuing)
+				this.$tabs.bind(this.options.event, stop);
+			else
+				this.$tabs.bind(this.options.event, function() {
+					stop();
+					t = self.options.selected;
+					start();
+				});
+		}
+		// stop interval
+		else {
+			stop();
+			this.$tabs.unbind(this.options.event, stop);
+		}
+	}
+});
 
 })(jQuery);