Refactoring Views.
Merge pull request #97 from viniband1/development

Refactoring Views.