Changed view to add more table columns