Refactored and Canvas displayed