screen handling changes again

when reverting client machines to a different screen you now have to tell
it which screen is closing. This should allow us to properly stack screens
at the client side