more changes to the structure including gifs and separating away many parts