Some more layout work, adding and removing < in editor works