Minor fixes in the CSD UI