Update and fix itemView rendering/filename issues.