Rewritten picker to use component instead of view