Merge "Fixing annoying bug where widget would drop to side page"