UI amendments to tie in with changes in core M2. No changes to Java code