improve views
Merge branch 'master' of https://github.com/olgacioroch/test-project