Refactoring views.
Refactoring js.