Updated to use ListView