Improving menu system