Bring enyo and lib/layout up to date
Move picker to right, major cleanup