Refactor layout to allow adding components in author mode

[#42996741]