Canvas

multiple updates to canvas and button functions