fix bugs introduced in last push, add picker page