Updated base picker view