Fix Some yaml UI bugs