clean code + manage cursor type + fix border radius