Added strong widget and fixed span widget