Redesign of the plugin