shuttle: make picker card collapse to the right size; refactoring