Add picker view control and minor code cleanup