added user email to job count and fixed list page
fixed merge conflict