fix row template and add manual mode back