remove internal menu var, switch to partially applied handlers
documentation; remove internal menu var, switch to partially applied handlers