restructuring and adding gifs (finally)