Adding picker view controller and some cleanup