Simplify entry layout, mimic email