fix view
Merge branch 'new_functional' into develop