Widget added and small fixes