#2 - button and image names improved