Fix Form locking and progress bar text oddities

Signed-off-by: Steven Downer <Grinch@outlook.com>