Revamped menu system