reorganize menu better