Further rework desktop version.