restructure router, fixed initial state-animation