picks ui improvements fixes #13 fixes #14