Minor tweaks to show and UI