Fixed widget style #30, fix #32 also