diff --git a/css/panopoly-magic.css b/css/panopoly-magic.css
new file mode 100644
index 0000000..83f6522
--- /dev/null
+++ b/css/panopoly-magic.css
@@ -0,0 +1,199 @@
+/**
+ * Panopoly Modal Magic Styles
+ */
+
+/**
+ * Styles for Menu Block Pane
+ */
+.menu-block-processed {
+  border: 0;
+}
+
+@media only screen and (max-width: 480px) {
+  /* Hide IPE from mobile, since it doesn't really work anyway */
+  #panels-ipe-control-container {
+    display: none !important;
+  }
+}
+
+/**
+ * Override of CTools Throbber
+ */
+a.ctools-ajaxing,
+input.ctools-ajaxing,
+button.ctools-ajaxing,
+select.ctools-ajaxing {
+  padding-right: 18px !important;
+  background: url(../images/status-active.gif) right center no-repeat !important;
+}
+
+div.ctools-ajaxing {
+  float: left;
+  width: 18px;
+  background: url(../images/status-active.gif) center center no-repeat !important;
+}
+
+.ajax-progress .throbber {
+  display: none;
+}
+
+.ajax-progress-throbber {
+  background-image: url("../images/status-active.gif");
+  background-position: center center;
+  background-repeat: no-repeat;
+  min-height: 16px;
+  opacity: .9;
+  padding: 3px;
+  width: 16px;
+  vertical-align: middle;
+}
+
+.ajax-progress-throbber .message {
+  display: none;
+}
+
+/**
+ * Custom styling for Changing Layout Feature
+*/
+div.ctools-modal-content div.form-item-categories label {
+  float: left;
+  font-weight: normal;
+  margin-top: 2px;
+  margin-right: 5px;
+  width: auto;
+}
+
+#panels-layout-category-Panopoly {
+  margin: 3% 6%;
+}
+
+div.ctools-modal-content .panels-choose-layout .dependent-options {
+  padding-left: 0px;
+}
+
+div.modal-content-preview-button {
+  padding-top: 100px;
+  text-align: center;
+}
+
+#panels-layout-category-Panopoly-wrapper .panels-layouts-category,
+#panels-layout-category-Panopoly-wrapper .layout-link div {
+  display: none;
+}
+
+#panels-layout-category-Panopoly-wrapper .layout-link {
+  float: left;
+  height: 68px;
+  padding: 1.25em;
+  text-align: center;
+  width: 68px;
+}
+
+#panels-layout-category-Panopoly-wrapper .layout-link:hover {
+  background-color: #BBB;
+}
+
+#panels-layout-category-Panopoly-wrapper .current-layout {
+  background-color: #DDD;
+}
+
+/**
+ * Custom styling for exposed views filter options
+ */
+#modal-content .form-item-offset,
+#modal-content .form-item-items-per-page,
+#modal-content .form-item-sort-order, 
+#modal-content .form-item-sort-by {
+  float: left;
+  width: 175px;
+}
+
+#modal-content .form-item-offset,
+#modal-content .form-item-sort-order {
+  clear: none;
+}
+
+#modal-content .form-item-sort-order label,
+#modal-content .form-item-sort-by label {
+  float: left;
+  font-weight: normal;
+  margin-right: 5px;
+  width: auto;
+  margin-top: 3px;
+  font-size: 100%;
+}
+
+#modal-content .form-item-exposed-pager-id label {
+  font-weight: normal;
+}
+
+#modal-content .general-settings-fieldset label {
+  float: left;
+  font-weight: normal;
+  width: auto;
+  margin-top: 5px;
+  margin-right: 5px;
+}
+
+#modal-content #edit-context label {
+  float: left;
+  font-weight: normal;
+  width: auto;
+  margin-top: 2px;
+  margin-right: 5px;
+}
+
+#modal-content #views-exposed-pane div.form-item {
+  display: inline;
+}
+
+#modal-content .form-item-view-settings {
+  display:inline;
+  margin-left: 5px;
+}
+
+/* Handle the Header Type Setting Element */
+#modal-content .form-item-header-type label {
+  display:inline;
+  clear: none;
+  font-weight: normal;
+  font-size: 12px;
+  margin-top: 5px;
+}
+
+#modal-content .form-item-header-type select {
+  display: inline;
+  margin-left: 5px;
+  margin-top: 5px;
+}
+
+#modal-content .view-settings-wrapper .field-prefix {
+  padding-right: 5px;
+}
+
+#modal-content .view-settings-wrapper .form-radios {
+  display: inline;
+  padding-right: 5px;
+}
+
+/**
+ * Custom Stylizer CSS
+ */
+#ctools_stylizer_color_scheme_form {
+  float: none;
+}
+
+#ctools_stylizer_color_scheme_form #palette .form-item  {
+  width: auto;
+  padding: .5em .75em;
+}
+
+div.ctools-modal-content #ctools_stylizer_color_scheme_form .form-item label {
+  width: auto;
+}
+
+#ctools_stylizer_color_scheme_form #palette .form-item label {
+  float: left;
+  margin-right: 10px;
+  margin-top: .25em;
+}
diff --git a/css/panopoly-modal.css b/css/panopoly-modal.css
new file mode 100644
index 0000000..6e6e3a0
--- /dev/null
+++ b/css/panopoly-modal.css
@@ -0,0 +1,525 @@
+/**
+ * Modal stylings
+ */
+
+#modal-content input.form-text {
+  max-width: 98%; /* Handle fixed width form elements in the IPE */
+}
+
+#modal-content .form-item-exposed-widget-title input,
+#modal-content .form-item-title input {
+  font-size: 1.5em;
+}
+
+#modalContent div.ctools-modal-content {
+  -webkit-border-radius: 10px 10px 0 0;
+  -moz-border-radius: 10px 10px 0 0;
+  border-radius: 10px 10px 0 0;
+  border: none;
+}
+
+#modalContent div.ctools-modal-content .modal-header {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+  background: #666;
+  background-image: linear-gradient(bottom, #333333 0%, #666666 100%);
+  background-image: -o-linear-gradient(bottom, #333333 0%, #666666 100%);
+  background-image: -moz-linear-gradient(bottom, #333333 0%, #666666 100%);
+  background-image: -webkit-linear-gradient(bottom, #333333 0%, #666666 100%);
+  background-image: -ms-linear-gradient(bottom, #333333 0%, #666666 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #333333),
+  color-stop(1, #666666)
+  );
+  color: #fff;
+  font: bold 16px/50px 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
+  vertical-align: middle;
+  height: 50px;
+  padding: 0 14px 0 24px;
+}
+
+#modalContent div.ctools-modal-content .modal-title {
+  color: #fff;
+  font: bold 16px/50px 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
+  text-shadow: none;
+  padding: 0;
+}
+
+#modalContent div.ctools-modal-content a.close {
+  display: block;
+  text-indent: -99999em;
+  overflow: hidden;
+  outline: none;
+  height: 15px;
+  width: 16px;
+  margin-top: 15px;
+  padding: 0;
+}
+
+#modalContent .panels-add-content-modal {
+  background: #FFF;
+  padding-top: .9em;
+}
+
+#modalContent .panels-add-content-modal a.panels-modal-add-category {
+  background: #EAEAEC;
+  background-image: linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -o-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -moz-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -webkit-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -ms-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #DBDCDF),
+  color-stop(1, #F6F6F7)
+  );
+  font: bold 11px/30px 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
+  color: #333;
+  text-decoration: none;
+  margin-left: 10px;
+  border-bottom: none;
+  padding: 0 12px;
+}
+
+#modalContent .panels-add-content-modal a.panels-modal-add-category:active, 
+#modalContent .panels-add-content-modal a.panels-modal-add-category.active {
+  border: 1px solid #CECECA;
+  border-right: none;
+  background: #FFF;
+  margin-right: -1px;
+}
+
+#modalContent .panels-section-column-categories .content-type-button {
+  padding: 0 0 .5em 10px;
+}
+
+#modalContent .panels-section-column-categories .content-type-button div {
+  background: #EAEAEC;
+  background-image: linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -o-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -moz-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -webkit-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -ms-linear-gradient(bottom, #DBDCDF 0%, #F6F6F7 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #DBDCDF),
+  color-stop(1, #F6F6F7)
+  );
+  float: none;
+  left: 0;
+  top: 0;
+  width: auto;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
+  margin: 0 8px 0 25px;
+  padding: 0;
+}
+
+#modalContent .panels-section-column-categories .content-type-button div a {
+  font: bold 11px/21px "Open Sans", "Lucida Grande", Tahoma, Verdana, sans-serif;
+  text-decoration: none;
+  color: #333;
+  padding: 0 12px;
+}
+
+#modalContent .panels-section-column-categories .content-type-button div:active {
+  outline: none;
+  background-image: linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
+  background-image: -o-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
+  background-image: -moz-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
+  background-image: -webkit-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
+  background-image: -ms-linear-gradient(bottom, #FFFFFF 0%, #E9EAEC 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #FFFFFF),
+  color-stop(1, #E9EAEC)
+  );
+}
+
+#modalContent .panels-section-column-categories .content-type-button img {
+  border: none;
+  padding-top: 2px;
+}
+
+#modalContent div.ctools-modal-content .modal-content {
+  padding-bottom: 2px;
+}
+
+#modal-content .option-text-aligner {
+  float: left;
+  width: auto;
+}
+
+/**
+ * Pane configuration preview styling
+ *
+ * Much of the fieldset-related css is ripped directly from Bartik to give
+ * IPE a more consistent look
+ * @see https://drupal.org/node/1717644
+ */
+#modal-content fieldset {
+  clear: none;
+  width: auto;
+  position: relative;
+  top: 12px; /* Offsets the negative margin of legends */
+  margin-top: 10px;
+  margin-bottom: 32px;
+  background: #FFFFFF;
+  border: 1px solid #CCCCCC;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  padding: 0 0 10px;
+}
+
+#modal-content fieldset.widget-preview {
+  margin-top: 3em;
+  margin-bottom: 4em;
+  -webkitborder-top-right-radius: 0;
+  -moz-border-topright-radius: 0;
+  border-top-right-radius: 0;
+}
+
+#modal-content fieldset.widget-preview-single {
+  margin-top: 0em;
+  margin-bottom: 1em;
+}
+
+#modal-content fieldset.widget-preview-single .fieldset-wrapper {
+  font-size: 100%;
+  max-width: 100%;
+  overflow-y: auto;
+  min-height: 75px;
+  max-height: 375px;
+}
+
+#modal-content fieldset.widget-preview-single .fieldset-wrapper .panopoly-spotlight img {
+  width: 100%;
+}
+  
+#modal-content fieldset legend {
+  background: #dbdbdb;
+  border: 1px solid #ccc;
+  border-bottom: none;
+  color: #3b3b3b;
+  display: block;
+  height: 2em;
+  left: -1px; /* LTR */
+  line-height: 2;
+  padding: 1px 0 0;
+  position: absolute;
+  text-indent: 10px;
+  text-shadow: 0 1px 0 #fff;
+  top: -12px;
+  width: 100%;
+  -moz-border-radius-topleft: 4px;
+  -webkit-border-top-left-radius: 4px;
+  border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -webkit-border-top-right-radius: 4px;
+  border-top-right-radius: 4px;
+}
+  
+#modal-content fieldset.widget-preview legend {
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-right-radius: 0;
+  border-top-right-radius: 0;
+}
+  
+#modal-content .fieldset-legend {
+  font: bold 12px/1.5em 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
+}
+  
+#modal-content fieldset.collapsed legend {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+
+#modal-content fieldset legend a {
+  color: #3b3b3b;
+}
+
+#modal-content fieldset legend a:hover,
+#modal-content fieldset legend a:focus,
+#modal-content fieldset legend a:active {
+  color: #000;
+}
+  
+#modal-content .fieldset-wrapper {
+  padding: 0 10px;
+  margin-top: 2.25em;
+}
+
+#modal-content .widget-preview .fieldset-wrapper {
+  max-width: 100%;
+  overflow-y: auto;
+  font-size: 75%;
+  max-height: 200px;
+  min-height: 200px;
+  overflow-x: hidden;
+}
+
+#modal-content .widget-preview .fieldset-wrapper table tr.even td, 
+#modal-content .widget-preview .fieldset-wrapper table tr.odd td {
+  padding: 3px 5px;
+}
+
+#modal-content .widget-preview .fieldset-wrapper h2 {
+  font-size: 150%;
+  margin-top: .25em;
+}
+
+#modal-content .widget-preview-single {
+  float: right;
+  margin-left: 1em;
+  margin-top: 0;
+  width: 48%;
+}
+
+#modal-content .form-actions {
+  float: right;
+  clear: right;
+  width: 48%;
+  margin-left: 1em;
+  text-align: right;
+}
+
+#modal-content .widget-preview-title {
+  position: absolute;
+  right: -1px;
+  top: -24px;
+  font: bold 11px/23px 'Open Sans', 'Lucida Sans', 'Lucida Grande', verdana sans-serif;
+}
+
+#modal-content .widget-preview-title .content-type-button div {
+  float: none;
+  left: 0;
+  top: 0;
+  width: 60px;
+  padding: 0;
+}
+
+#modal-content .widget-preview-title .content-type-button div a {
+  display: block;
+  font: bold 11px/23px 'Open Sans', 'Lucida Sans', 'Lucida Grande',  verdana sans-serif;
+  color: #fff;
+  text-decoration: none;
+  background: #5DE000;
+  background-image: linear-gradient(bottom, #4BA700 0%, #5DE000 100%);
+  background-image: -o-linear-gradient(bottom, #4BA700 0%, #5DE000 100%);
+  background-image: -moz-linear-gradient(bottom, #4BA700 0%, #5DE000 100%);
+  background-image: -webkit-linear-gradient(bottom, #4BA700 0%, #5DE000 100%);
+  background-image: -ms-linear-gradient(bottom, #4BA700 0%, #5DE000 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #4BA700),
+  color-stop(1, #5DE000)
+  );
+  -webkit-border-radius: 3px 3px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
+  border-radius: 3px 3px 0 0;
+  padding: 0 10px;
+}
+
+#modal-content .widget-preview-title .content-type-button div a:hover {
+  background: #56CE00;
+  background-image: linear-gradient(bottom, #408E00 0%, #56CE00 100%);
+  background-image: -o-linear-gradient(bottom, #408E00 0%, #56CE00 100%);
+  background-image: -moz-linear-gradient(bottom, #408E00 0%, #56CE00 100%);
+  background-image: -webkit-linear-gradient(bottom, #408E00 0%, #56CE00 100%);
+  background-image: -ms-linear-gradient(bottom, #408E00 0%, #56CE00 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #408E00),
+  color-stop(1, #56CE00)
+  );
+}
+
+#modal-content .widget-preview-title .content-type-button div a:active {
+  background: #5DE000;
+  background-image: linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
+  background-image: -o-linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
+  background-image: -moz-linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
+  background-image: -webkit-linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
+  background-image: -ms-linear-gradient(bottom, #5DE000 0%, #4BA700 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #5DE000),
+  color-stop(1, #4BA700)
+  );
+}
+
+#modal-content .panels-section-columns,
+#modal-content .panels-categories-description {
+  overflow: visible;
+  border: 1px solid #CECECA;
+  border-right: none;
+  height: 100%;
+  margin: 0;
+  margin-top: 1px;
+  overflow-y: auto;
+}
+
+#modal-content .panels-categories-description {
+  color: #FFF;
+}
+
+/**
+ * Misc Modal Stylings
+ */
+#modal-content .form-type-textarea .form-type-select, 
+#modal-content .field-type-text-long .form-type-select {
+  float: right;
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+#modal-content .form-type-textarea .form-type-select label, 
+#modal-content .field-type-text-long .form-type-select label {
+  float: left;
+  margin-right: .5em;
+  margin-top: .5em;
+  font-weight: normal;
+  display: block;
+  width: auto;
+}
+
+#modal-content .view-settings-wrapper .form-radios {
+  display: inline;
+  padding-right: 5px;
+}
+
+.panels-section-column .content-type-button {
+  font-size: 1em;
+}
+
+#modal-content .widget-preview-title .content-type-button img, 
+#modal-content .panels-add-content-modal > .panels-modal-add-category {
+  display: none;
+}
+
+#modal-content #edit-widget-preview {
+  margin-top: 0;
+}
+
+#modalContent .panels-section-column-categories .content-type-button img:hover {
+  border: none;
+}
+
+#modal-content .widget-preview .fieldset-wrapper table img, 
+#modal-content .widget-preview .panopoly-image-featured {
+  width: 100%;
+}
+
+.pane-content .create-links, 
+.pane-categories .categories-links, 
+.pane-menus .menu-links, 
+.pane-users .user-links {
+  float: right;
+}
+
+#modalContent .panels-add-content-modal a.panels-modal-add-category:hover, 
+#modalContent .panels-section-column-categories .content-type-button div:hover {
+  background: #E6E6E6;
+  background-image: linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -o-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -moz-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -webkit-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -ms-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #C5C5C5),
+  color-stop(1, #FAFAFA)
+  );
+}
+
+/**
+ * Form action button styling
+ */
+#modal-content .form-submit {
+  border: 1px solid #ccc;
+  margin-bottom: .5em;
+  margin-right: 1em;
+  font: bold 12px/32px 'Open Sans', 'Lucida Sans', 'Lucida Grande',  verdana sans-serif;
+  text-decoration: none;
+  height: 33px;
+  color: #666;
+  cursor: pointer;
+  outline: none;
+  -moz-border-radius: 3px;
+  -khtml-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  background: #FAFAFA;
+  background-image: linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -o-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -moz-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -webkit-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -ms-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #E9EAEC),
+  color-stop(1, #FAFAFA)
+  ); 
+  -webkit-box-shadow: 0 3px 3px 0 #d2d2d2;
+  -moz-box-shadow: 0 3px 3px 0 #d2d2d2;
+  box-shadow: 0 3px 3px 0 #d2d2d2;
+  padding: 0 13px 1px;
+}
+
+#modal-content .form-submit:hover {
+  background: #E6E6E6;
+  background-image: linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -o-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -moz-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -webkit-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -ms-linear-gradient(bottom, #C5C5C5 0%, #FAFAFA 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #C5C5C5),
+  color-stop(1, #FAFAFA)
+  );
+}
+
+#modal-content .form-submit:active {
+  outline: none;
+  background-image: linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -o-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -moz-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -webkit-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -ms-linear-gradient(bottom, #E9EAEC 0%, #FAFAFA 100%);
+  background-image: -webkit-gradient(
+  linear,
+  left bottom,
+  left top,
+  color-stop(0, #E9EAEC),
+  color-stop(1, #FAFAFA)
+  );
+  -webkit-box-shadow: 0 0 0 0 #fff;
+  -moz-box-shadow: 0 0 0 0 #fff;
+  box-shadow: 0 0 0 0 #fff;
+}
diff --git a/panopoly-magic.css b/panopoly-magic.css
deleted file mode 100644
index 2afd940..0000000
--- a/panopoly-magic.css
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Panopoly Modal Magic Styles
- */
-
-/**
- * Styles for Menu Block Pane
- */
-.menu-block-processed {
-  border: 0;
-}
-
-@media only screen and (max-width: 480px) {
-  /* Hide IPE from mobile, since it doesn't really work anyway */
-  #panels-ipe-control-container {
-    display: none !important;
-  }
-}
-
-/**
- * Override of CTools Throbber
- */
-a.ctools-ajaxing,
-input.ctools-ajaxing,
-button.ctools-ajaxing,
-select.ctools-ajaxing {
-  padding-right: 18px !important;
-  background: url(images/status-active.gif) right center no-repeat !important;
-}
-
-div.ctools-ajaxing {
-  float: left;
-  width: 18px;
-  background: url(images/status-active.gif) center center no-repeat !important;
-}
-
-.ajax-progress .throbber {
-  display: none;
-}
-
-.ajax-progress-throbber {
-  background-image: url("images/status-active.gif");
-  background-position: center center;
-  background-repeat: no-repeat;
-  min-height: 16px;
-  opacity: .9;
-  padding: 3px;
-  width: 16px;
-  vertical-align: middle;
-}
-
-.ajax-progress-throbber .message {
-  display: none;
-}
-
-/**
- * Custom styling for Changing Layout Feature
-*/
-div.ctools-modal-content div.form-item-categories label {
-  float: left;
-  font-weight: normal;
-  margin-top: 2px;
-  margin-right: 5px;
-  width: auto;
-}
-
-#panels-layout-category-Panopoly {
-  margin: 3% 6%;
-}
-
-div.ctools-modal-content .panels-choose-layout .dependent-options {
-  padding-left: 0px;
-}
-
-div.modal-content-preview-button {
-  padding-top: 100px;
-  text-align: center;
-}
-
-#panels-layout-category-Panopoly-wrapper .panels-layouts-category,
-#panels-layout-category-Panopoly-wrapper .layout-link div {
-  display: none;
-}
-
-#panels-layout-category-Panopoly-wrapper .layout-link {
-  float: left;
-  height: 68px;
-  padding: 1.25em;
-  text-align: center;
-  width: 68px;
-}
-
-#panels-layout-category-Panopoly-wrapper .layout-link:hover {
-  background-color: #BBB;
-}
-
-#panels-layout-category-Panopoly-wrapper .current-layout {
-  background-color: #DDD;
-}
-
-/**
- * Custom styling for exposed views filter options
- */
-#modal-content .form-item-offset,
-#modal-content .form-item-items-per-page,
-#modal-content .form-item-sort-order, 
-#modal-content .form-item-sort-by {
-  float: left;
-  width: 175px;
-}
-
-#modal-content .form-item-offset,
-#modal-content .form-item-sort-order {
-  clear: none;
-}
-
-#modal-content .form-item-sort-order label,
-#modal-content .form-item-sort-by label {
-  float: left;
-  font-weight: normal;
-  margin-right: 5px;
-  width: auto;
-  margin-top: 3px;
-  font-size: 100%;
-}
-
-#modal-content .form-item-exposed-pager-id label {
-  font-weight: normal;
-}
-
-#modal-content .general-settings-fieldset label {
-  float: left;
-  font-weight: normal;
-  width: auto;
-  margin-top: 5px;
-  margin-right: 5px;
-}
-
-#modal-content #edit-context label {
-  float: left;
-  font-weight: normal;
-  width: auto;
-  margin-top: 2px;
-  margin-right: 5px;
-}
-
-#modal-content #views-exposed-pane div.form-item {
-  display: inline;
-}
-
-#modal-content .form-item-view-settings {
-  display:inline;
-  margin-left: 5px;
-}
-
-/* Handle the Header Type Setting Element */
-#modal-content .form-item-header-type label {
-  display:inline;
-  clear: none;
-  font-weight: normal;
-  font-size: 12px;
-  margin-top: 5px;
-}
-
-#modal-content .form-item-header-type select {
-  display: inline;
-  margin-left: 5px;
-  margin-top: 5px;
-}
-
-#modal-content .view-settings-wrapper .field-prefix {
-  padding-right: 5px;
-}
-
-#modal-content .view-settings-wrapper .form-radios {
-  display: inline;
-  padding-right: 5px;
-}
-
-/**
- * Custom Stylizer CSS
- */
-#ctools_stylizer_color_scheme_form {
-  float: none;
-}
-
-#ctools_stylizer_color_scheme_form #palette .form-item  {
-  width: auto;
-  padding: .5em .75em;
-}
-
-div.ctools-modal-content #ctools_stylizer_color_scheme_form .form-item label {
-  width: auto;
-}
-
-#ctools_stylizer_color_scheme_form #palette .form-item label {
-  float: left;
-  margin-right: 10px;
-  margin-top: .25em;
-}
diff --git a/panopoly_magic.info b/panopoly_magic.info
old mode 100755
new mode 100644
index 4da66e9..b040b3a
--- a/panopoly_magic.info
+++ b/panopoly_magic.info
@@ -11,5 +11,7 @@ dependencies[] = page_manager
 dependencies[] = panels_ipe
 dependencies[] = views
 scripts[] = panopoly-magic.js
-stylesheets[all][] = panopoly-magic.css
+stylesheets[all][] = css/panopoly-magic.css
+stylesheets[all][] = css/panopoly-modal.css
 features[features_api][] = api:1
+
diff --git a/panopoly_magic.module b/panopoly_magic.module
index 23486af..017d75b 100755
--- a/panopoly_magic.module
+++ b/panopoly_magic.module
@@ -636,7 +636,7 @@ function panopoly_magic_form_views_content_views_panes_content_type_edit_form_al
   // Add specific style options.
   $form['content_settings']['view_mode'] = array(
     '#type' => 'radios',
-    '#options' => panopoly_core_view_mode_options(),
+    '#options' => panopoly_magic_view_mode_options(),
     '#default_value' => $conf['view_mode'] ? $conf['view_mode'] : 'teaser',
     '#states' => array(
       'visible' => array(
@@ -1261,3 +1261,20 @@ function panopoly_magic_process_panels_add_content_modal(&$vars) {
     }
   }
 }
+
+/**
+ * Helpfer function to get view modes
+ */
+function panopoly_magic_view_mode_options() {
+  $entity_info = entity_get_info('node');
+  $options = array();
+  if (!empty($entity_info['view modes'])) {
+    foreach ($entity_info['view modes'] as $mode => $settings) {
+      if (!in_array($mode, array('rss', 'search_index', 'search_result', 'token'))) {
+        $options[$mode] = $settings['label'];
+      }
+    }
+  }
+  return $options;
+}
+