Positioning optimized, NumberPicker added