I have changed the use of the canvas in Desk.java a bit