Added Mail layouts and General layout update