Animation and structure tweaks