Add category support. Increased widget control options