Continued recode of boiler gui