Some changes to widgets