Added better support for pick display page