Better nesting for larger plot
Adopt agenda Widget and party list