111020141348EST: Partial refactoring in the view file

Partial refactoring for view file, trying to make this file even more
clear