Sophie | #3985 & #3986 | UI on the overview page