Updated widget code to include default values so we don't get errors