Organized contracts on the mail page and some minor fixes