GCP-7983 Ui Fixes
Merge branch 'master' of https://github.com/digitalabs/IBPCommons