copy visiual improvements from Francesco