More changes to get canvas to display properly