Merge branch 'enhancement/ui-layout-modification'