Feature/custom fields on overview tab