Valama: Further moving to main widget