Fix some potential markup errors, fix cancel button and behavior when
close or escape is pressed on the progress window