Move cancel to the correct place. Add comments