OPAL-1981 & OPAL-1931: Properties edition UI and Fixing error with Categories edition