Re-do the options menu and tweak the plugins menu a bit.