changes to the overview page
fixed conflict