Merge branch 'features/ui-ux-improvements' into refactor-clean