Bug Fixes + widget management