- button and image names improved