Removed useless functions and added a border to the Canvas
Fixed conflict