Keyholder and Guest UI improved