Reworked Editor Layout