simplifing and stabilizing controllers and views...