Fixed issue wih plugin layout being broken