Fix markup; add spacing for widgets.