Added more stuff to the canvas skeleton