Controller/View refactoring
Controller/View update