Model and view changes

Empty commit?