added changes on view
Merge branch 'commit'