Refactored, Added Canvas UI