better fieldsets, more links and lists