add checkbox and textarea. remove legacy