Refactored menu slightly, added listmenu (works like menu works).