Reorganize some stuff
Add gifs