Further consolidation of editor
Border consolidation