Menu manager rewrite