Screens are now associated with correct controller classes again

Fixed minor bug where client did not close cleanly