Updated basic widgets