Fix widget intialization