Clean up handling picker stuff
Add tab controller