Fixed VM, added UI