Fixing some files for UI