rearraged name fields
fix active class bug