added Enrico's widgets for issue #4