Update to more views to fetch & display stats in tables