Fixing wrong merge. Fortunatelly there were only some code duplicates and minor issue which didn't break code.
Fixing wrong merge. Fortunatelly there were only some code duplicates and minor issue which didn't break code.

pholica/virtui,pholica/virtui