Improve layout editor