Simplify layout, constants, mailers