Moved everything into canvas