Improved Redactor integration and resolved a few issues