Some changes in widget