Further Pick Page Improvements

Pick Improvements