added button images, expanded menu