More side picker tweaks