Fix rename modal + small fixes