added a switch to change picker shape