Cleaned up some of the AJAX and display plugin handling.