JC: more cn. minor view refectoring.