Added the view logic