Structural improvements to plugins and layout