bug fix : removed duplicate widget wrapper