Issue #2065257 by coltrane: Put menu callbacks and forms in separate inc file.