Heri | #3519 & 3952 | Updating information on overview page