refactor system submenu