Added span class to button and image