fixed issues to support lower sdk and changed picker text