reorganize menu a little bit