Changed loading structure for UF-Layouts