More refactoring on the controller and view, update todos