Implement pop animation fixes #61