refactor views
Merge branch 'salidinov2'