ListView Changes still bugs...
fixed merge conflicts