improve widget & bugfixes