Modified the view and template