Moved declaration of menu popup types