diff --git a/CHANGELOG.md b/CHANGELOG.md
index afbf666..50eb301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## 3.0.0
+* Improved Quick-Edit and Bulk-Edit support
+* Remove `attachment` type support for now, as there is no way to switch back
+* Fix bug causing some post-types to switch unexpectedly
+
 ## 2.0.1
 * Ensure quick-edit works with new procedure
 * Quick-edit "Type" column works again!
diff --git a/assets/js/quickedit.js b/assets/js/quickedit.js
index 75dac67..6cc94ec 100644
--- a/assets/js/quickedit.js
+++ b/assets/js/quickedit.js
@@ -4,9 +4,21 @@ function pts_quick_edit() {
 	var $ = jQuery;
 	var _edit = inlineEditPost.edit;
 
+	$( '#bulk-edit' )
+		.find( '.inline-edit-col-right .inline-edit-col' )
+		.append(
+			$('#bulk-edit #pts_bulk_edit' )
+		);
+
+	$( '.inline-edit-row' ).not( '#bulk-edit' )
+		.find( '.inline-edit-col-right .inline-edit-col' )
+		.append(
+			$( '.inline-edit-row #pts_quick_edit' )
+		);
+
 	inlineEditPost.edit = function( id ) {
 
-		var args = [].slice.call(arguments );
+		var args = [].slice.call( arguments );
 
 		_edit.apply( this, args );
 
@@ -16,17 +28,17 @@ function pts_quick_edit() {
 
 		var
 
-			// editRow is the quick-edit row, containing the inputs that need to be updated
-			editRow   = $( '#edit-' + id ),
+			// edit_row is the quick-edit row, containing the inputs that need to be updated
+			edit_row   = $( '#edit-' + id ),
 
-			// postRow is the row shown when a book isn't being edited, which also holds the existing values.
-			postRow   = $( '#post-' + id ),
+			// post_row is the row shown when a book isn't being edited, which also holds the existing values.
+			post_row   = $( '#post-' + id ),
 
 			// get the existing values
-			post_type = $( '.post_type', postRow ).data( 'post-type' );
-		
+			post_type = $( 'td.post_type span', post_row ).data( 'post-type' );
+
 		// set the values in the quick-editor
-		$( 'select[name="pts_post_type"] option[value="' + post_type + '"]', editRow ).attr( 'selected', 'selected' );
+		$( 'select[name="pts_post_type"] option[value="' + post_type + '"]', edit_row ).attr( 'selected', 'selected' );
 	};
 }
 
diff --git a/post-type-switcher.php b/post-type-switcher.php
index 7193a9e..d9a263f 100644
--- a/post-type-switcher.php
+++ b/post-type-switcher.php
@@ -16,7 +16,7 @@
  * License:     GPLv2 or later
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Description: Allow switching of a post type while editing a post (in post publish section)
- * Version:     2.0.1
+ * Version:     3.0.0
  * Text Domain: post-type-switcher
  * Domain Path: /assets/lang/
  */
@@ -31,6 +31,15 @@
  */
 final class Post_Type_Switcher {
 
+	/**
+	 * Asset version, for cache busting
+	 *
+	 * @since 3.0.1
+	 *
+	 * @var int
+	 */
+	private $asset_version = 201609170001;
+
 	/**
 	 * Hook in the basic early actions
 	 *
@@ -71,11 +80,11 @@ public function admin_init() {
 		add_action( 'manage_pages_custom_column',  array( $this, 'manage_column' ), 10,  2 );
 
 		// Add UI to "Publish" metabox
-		add_action( 'admin_head',                  array( $this, 'admin_head'       ) );
-		add_action( 'post_submitbox_misc_actions', array( $this, 'metabox'          ) );
-		add_action( 'quick_edit_custom_box',       array( $this, 'quickedit'        ), 10,  2 );
-		add_action( 'bulk_edit_custom_box',        array( $this, 'quickedit'        ), 10,  2 );
-		add_action(	'admin_enqueue_scripts',       array( $this, 'quickedit_script' ), 10,  1 );
+		add_action( 'admin_head',                  array( $this, 'admin_head'        ) );
+		add_action( 'post_submitbox_misc_actions', array( $this, 'metabox'           ) );
+		add_action( 'quick_edit_custom_box',       array( $this, 'quick_edit'        ) );
+		add_action( 'bulk_edit_custom_box',        array( $this, 'quick_edit_bulk'   ) );
+		add_action(	'admin_enqueue_scripts',       array( $this, 'quick_edit_script' ) );
 
 		// Override
 		add_filter( 'wp_insert_attachment_data', array( $this, 'override_type' ), 10, 2 );
@@ -108,9 +117,14 @@ public function metabox() {
 		// https://wordpress.org/support/topic/dont-show-for-non-public-post-types?replies=4#post-5849287
 		if ( ! in_array( $cpt_object, $post_types, true ) ) {
 			$post_types[ $post_type ] = $cpt_object;
-		} ?>
+		}
 
-		<div class="misc-pub-section misc-pub-section-last post-type-switcher">
+		// Unset attachment types, since support seems to be broken
+		if ( isset( $post_types['attachment'] ) ) {
+			unset( $post_types['attachment'] );
+		}
+
+		?><div class="misc-pub-section misc-pub-section-last post-type-switcher">
 			<label for="pts_post_type"><?php esc_html_e( 'Post Type:', 'post-type-switcher' ); ?></label>
 			<span id="post-type-display"><?php echo esc_html( $cpt_object->labels->singular_name ); ?></span>
 
@@ -175,25 +189,47 @@ public function manage_column( $column, $post_id ) {
 	 *
 	 * @since 1.2.0
 	 */
-	public function quickedit( $column_name, $post_type ) {
+	public function quick_edit( $column_name = '' ) {
+
+		// Bail to prevent multiple dropdowns in each column
+		if ( 'post_type' !== $column_name ) {
+			return;
+		} ?>
+
+		<div id="pts_quick_edit" class="inline-edit-group wp-clearfix">
+			<label class="alignleft">
+				<span class="title"><?php esc_html_e( 'Post Type', 'post-type-switcher' ); ?></span><?php
+
+				wp_nonce_field( 'post-type-selector', 'pts-nonce-select' );
+
+				$this->select_box();
+
+			?></label>
+		</div>
+
+	<?php
+	}
+
+	/**
+	 * Adds quickedit button for bulk-editing post types
+	 *
+	 * @since 1.2.0
+	 */
+	public function quick_edit_bulk( $column_name = '' ) {
 
 		// Bail to prevent multiple dropdowns in each column
 		if ( 'post_type' !== $column_name ) {
 			return;
 		} ?>
 
-		<fieldset class="inline-edit-col-right">
-			<div class="inline-edit-col">
-				<label class="alignleft">
-					<span class="title"><?php esc_html_e( 'Post Type', 'post-type-switcher' ); ?></span><?php
+		<label id="pts_bulk_edit" class="alignleft">
+			<span class="title"><?php esc_html_e( 'Post Type', 'post-type-switcher' ); ?></span><?php
 
-					wp_nonce_field( 'post-type-selector', 'pts-nonce-select' );
+			wp_nonce_field( 'post-type-selector', 'pts-nonce-select' );
 
-					$this->select_box();
+			$this->select_box( true );
 
-				?></label>
-			</div>
-		</fieldset>
+		?></label>
 
 	<?php
 	}
@@ -203,13 +239,15 @@ public function quickedit( $column_name, $post_type ) {
 	 *
 	 * @since 1.2
 	 */
-	public function quickedit_script( $hook = '' ) {
+	public function quick_edit_script( $hook = '' ) {
 
+		// Bail if not edit.php admin page
 		if ( 'edit.php' !== $hook ) {
 			return;
 		}
 
-		wp_enqueue_script( 'pts_quickedit', plugin_dir_url( __FILE__ ) . 'assets/js/quickedit.js', array( 'jquery' ), '', true );
+		// Enqueue quick edit JS
+		wp_enqueue_script( 'pts_quickedit', plugin_dir_url( __FILE__ ) . 'assets/js/quickedit.js', array( 'jquery' ), $this->asset_version, true );
 	}
 
 	/**
@@ -217,24 +255,52 @@ public function quickedit_script( $hook = '' ) {
 	 *
 	 * @since 1.2
 	 */
-	public function select_box() {
-		$post_types = get_post_types( $this->get_post_type_args(), 'objects' );
+	public function select_box( $bulk = false ) {
+
+		// Get post type specific data
+		$args       = $this->get_post_type_args();
+		$post_types = get_post_types( $args, 'objects' );
 		$post_type  = get_post_type();
+		$selected   = '';
+
+		// Unset attachment types, since support seems to be broken
+		if ( isset( $post_types['attachment'] ) ) {
+			unset( $post_types['attachment'] );
+		}
 
+		// Start an output buffer
+		ob_start();
+
+		// Output
 		?><select name="pts_post_type" id="pts_post_type"><?php
 
+			// Maybe include "No Change" option for bulk
+			if ( true === $bulk ) :
+				?><option value="-1"><?php esc_html_e( '&mdash; No Change &mdash;', 'post-type-switcher' ); ?></option><?php
+			endif;
+
+			// Loop through post types
 			foreach ( $post_types as $_post_type => $pt ) :
 
+				// Skip if user cannot publish this type of post
 				if ( ! current_user_can( $pt->cap->publish_posts ) ) :
 					continue;
 				endif;
 
-				?><option value="<?php echo esc_attr( $pt->name ); ?>" <?php selected( $post_type, $_post_type ); ?>><?php echo esc_html( $pt->labels->singular_name ); ?></option><?php
+				// Only select if not bulk
+				if ( false === $bulk ) :
+					$selected = selected( $post_type, $_post_type );
+				endif;
+
+				// Output option
+				?><option value="<?php echo esc_attr( $pt->name ); ?>" <?php echo $selected; // Do not escape ?>><?php echo esc_html( $pt->labels->singular_name ); ?></option><?php
 
 			endforeach;
 
 		?></select><?php
 
+		// Output the current buffer
+		echo ob_get_clean();
 	}
 
 	/**
@@ -343,6 +409,9 @@ public function admin_head() {
 			});
 		</script>
 		<style type="text/css">
+			#wpbody-content .inline-edit-row .inline-edit-col-right .alignleft + .alignleft {
+				float: right;
+			}
 			#post-type-select {
 				line-height: 2.5em;
 				margin-top: 3px;
diff --git a/readme.txt b/readme.txt
index e451879..180b1d3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,24 +1,29 @@
 === Post Type Switcher ===
 Contributors: johnjamesjacoby, beatpanda, norcross, stuttter
-Tags: post type
+Tags: post, page, type, types, post type
 Requires at least: 3.0
-Tested up to: 4.6
-Stable tag: 2.0.1
+Tested up to: 4.7
+Stable tag: 3.0.0
+License: GPLv2 or later
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
+Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9Q4F4EL5YJ62J
 
 A simple way to change a post's type in WordPress
 
 == Description ==
 
-This plugin adds a simple post type dropdown to the post editor interface, allowing you to reassign any post to a new post type. It allows you to switch post's type while editing your post.
+This plugin adds a simple post-type drop-down to the post editor interface, allowing you to reassign any post to a new post type. It allows you to switch post's type while editing your post.
 
 = Supported Types =
 
-The plugin can convert nearly every combination of posts, pages, attachments, and even custom post types:
+The plugin can convert nearly every combination of posts, pages, and even custom post types:
 
 * Page to Post
 * Post to Page
-* Page to Attachment
 * Post to Custom
+* Custom to Custom
+
+As of 3.0.0, support for switching to or from Attachments was removed. This may come back in a subsequent version.
 
 Invisible post types, such as revisions, menus, etc., are purposely excluded. But, if you need to access invisible post types, you can adjust the boundaries using the 'pts_post_type_filter' filter.
 
@@ -30,7 +35,7 @@ With bulk editing, thanks to Matthew Gerring, you can select all the posts in a
 
 = Installation =
 1. In your WordPress Dashboard go to "Plugins" -> "Add Plugin".
-2. Search for "Post Type Swticher".
+2. Search for "Post Type Switcher".
 3. Install the plugin by pressing the "Install" button.
 4. Activate the plugin by pressing the "Activate" button.
 5. From the post edit screen, above the "Publish" button is the "Post Type" interface.
@@ -43,8 +48,8 @@ With bulk editing, thanks to Matthew Gerring, you can select all the posts in a
 
 = Recommended Requirements =
 * Latest WordPress version.
-* PHP version 5.6 or greater.
-* MySQL version 5.5 or greater.
+* PHP version 7.0 or greater.
+* MySQL version 5.7 or greater, or MariaDB 10 or greater.
 
 == Frequently Asked Questions ==
 
@@ -61,19 +66,24 @@ It should not. This plugin only changes the 'post_type' property of a post.
 
 == Changelog ==
 
-= Version 2.0.1 =
+= 3.0.0 =
+* Improved Quick-Edit and Bulk-Edit support
+* Remove `attachment` type support for now, as there is no way to switch back
+* Fix bug causing some post-types to switch unexpectedly
+
+= 2.0.1 =
 * Ensure quick-edit works with new procedure
 * Quick-edit "Type" column works again!
 
-= Version 2.0.0 =
+= 2.0.0 =
 * Improved plugin compatibility with WooThemes Sensei
 * Filter post arguments vs. hook to save_post
 * Add "post_type_switcher" action
 
-= Version 1.7.0 =
+= 1.7.0 =
 * Add support for network activation
 
-= Version 1.6.0 =
+= 1.6.0 =
 * Add textdomains for localization
 * Load translation strings using load_plugin_textdomain()
 * Before saving data chack if it's not an autosave using wp_is_post_autosave()
@@ -82,44 +92,44 @@ It should not. This plugin only changes the 'post_type' property of a post.
 * Security: Translation strings escaping
 * Add screenshots
 
-= Version 1.5.0 - norcross =
+= 1.5.0 - norcross =
 * Fix multiple quickedit dropdowns
 
-= Version 1.4.0 =
+= 1.4.0 =
 * Improve handling of non-public post types
 
-= Version 1.3.0 =
+= 1.3.0 =
 * Fix saving of autodrafts
 
-= Version 1.2.1 =
+= 1.2.1 =
 * Improved WordPress 3.9 integration (added dashicon to publish metabox)
 
-= Version 1.2.0 =
+= 1.2.0 =
 * Add bulk editing to supported post types
 * Props Matthew Gerring for bulk edit contribution
 
-= Version 1.1.1 =
+= 1.1.1 =
 * Add is_admin() check to prevent theme-side interference
 * Change save_post priority to 999 to avoid plugin compatibility issues
 * Remove ending closing php tag
 * HTML and PHPDoc improvements
 
-= Version 1.1.0 =
+= 1.1.0 =
 * Fix revisions being nooped
 * Fix malformed HTML for some user roles
-* Classificationate
+* Make a singleton (meh...)
 
-= Version 1.0.0 =
+= 1.0.0 =
 * Fix JS bugs
 * Audit post save bail conditions
 * Tweak UI for WordPress 3.3
 
-= Version 0.3.0 =
+= 0.3.0 =
 * Use the API to change the post type, fixing a conflict with persistent object caches
 * No longer requires JavaScript
 
-= Version 0.2.0 =
+= 0.2.0 =
 * Disallow post types that are not public and do not have a visible UI
 
-= Version 0.1.0 =
+= 0.1.0 =
 * Release