JC: revamping the models and views. fixed speces.