Minor changes to the datatext system, changed UF layout 2