#1020: continue and draw button bugs fixed