new view
update view after correcting merge conflict and personnal issu i've made