Polished up the widget focus methods.