Basic changes, put buttons into canvas toolbar