Cleaned up menu system