Revert "More editor and layout bugs fixed"

This reverts commit df320c39b18f45e3e776ab2e2509d264b5575e22.
Revert "Revert "More editor and layout bugs fixed""

This reverts commit daec6b047906999dfbfc3029c1e04af470659b6e.
Revert daec6b0..6e5bbbb

This rolls back to commit daec6b047906999dfbfc3029c1e04af470659b6e.
Comments updated