Added EpicEditor; Layout fixes for System