Make sure Client dies when the window is destroyed
More layout fixes