More editor and layout bugs fixed