JC: refectoring views.
JC: fixed spec and a typo in views. spec passes.