Layout tweaks and simplified animation controls