TASK41: Moved canvas into our markup

Need further changes with the buttons