Simplified something
ListView works less bad now