fix upload problem and add finish button.