POPS-175 Fixes with data structure changes and modal dialog