Minor UI improvement tweaks