GCP-7476 - initial UI changes
Merge branch 'master' of https://github.com/digitalabs/Fieldbook