Various view changes & model refactors