Improvements to deployment screens, a few bug fixes