More consistent labels  on prepare deployment screen
Timers in minutes again, and reasonable timeouts