CORE-347 UI/UX improvements