refactor picker layout