Minor UI and other tweaks
Minor UI and other tweaks