fix more rebase errors
(cannot import client, otherwise widgets loaded before application)
extract more calls,
did we need a complete interface for _clientwindow?