Animations
Image placeholders
Improvemnets and refactor