Add upper_text/lower_text to piece
Remove upper_text/lower_text from Survey::Form