Fixed option menu layout
Merge remote-tracking branch 'remotes/ajf/serverplugins'