Minor formatting changes
Fixed rendering issue

Issue occured when alternative views selected before animation
Merged changes