Removed use of intermediate menu callback to simplify things.