Moved plugin options next to plugin. Other fixes.