Removed tab dragging
Fixed Merge Conflicts