Fixed webapp and added changes for plugin.