Various small fixes. Toggle widget almost finished