GCP-7476 fix popup ui
Merge branch 'master' of https://github.com/digitalabs/Fieldbook