More progress on new sim type page