Editor integration checkpoint.
Layout and style tweaks