Misc fixes + new widget implementation