Feature/5 edit main view 9