Merged David and Sal's code for clearing canvas and tabbed layout support