Swithc for the circular view and animation fix.