Improve bg-picker