111020141316EST: Partial refactoring for view

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