Added conditional widgets