Add buttons and text boxes, match against \r as well as \n