Improved editor layout