Improve model<>view consistency and extend master layout