Beginning refactoring on View and Controller

Beginning refactoring on View and Controller