Added plugins and quick fix for secondary forms