refactor menu layout