Changed cell subviews to have correct tags