with widget classes added