Added spying, fixed widget focus