Refactoring. Applying MVC Pattern. AddView added.