Do we need a button here? In my humble opinion the WYSIWYG Editor is also a layout so I would make it accessable through the layout-button.
In regards of the other changes I would only move buttons if we have a clear understanding where we want to go - because the actual set up is not that bad 