Tweaks to The data output and UI changes