added map and canvas