Minor changes on widgets