No longer always highlighting first row