updated core model and views, and accounts views