Added a working picker view (again)