Added canvas setup