Trying to refactor the views.
Comments fixed.
Merge branch 'feature/refactoring' into develop

* feature/refactoring:
  Comments fixed.
  Trying to refactor the views.
Slight views refactoring, tests improved.