VID-1224 Fix some spacing issues