Remade menu, defined classes