Removed routeparams
fixed animations merge conflicts