Remade some UI