Fix refresh row class bug and clean up staff popup with adult/child