some new model and view added and working on layout
conflicts resolved