Fixing item view bugs