Layout tweaks and animations