Make picker work better