Updated models, added account view