Fixes with widget display