Fixed some margin offset and restored animations on blocks
Merge conflicts