Wip/code plugin rework layout fixes