Remove garb
Hide some of the UF details
Fix missing file