CORE-347 UI/UX improvements

CORE-347 UI/UX improvements