Update for Canvas Layout