Menu building logic fixes