Refactoring

Changed the view to have name