Moved from popup to options menu