Cleaned up Widget configuration