Added picker to view
Bunch o' changes