ux fixes, file cleanup