Code Refactor

Moved View Logic from controller to View Class/File. Fixes rSKfecd63908eab