fix merge errors
added text field to the desktop demo