Reworked editor toolbar (again/mad)