More work on deployment screens