animations and circular template issue fix