Improve pick button styles in selector