add more menu
simplify code