Fixed a bug regarding rowCount and improved visualization