Refucktoring into objects
Refucking fine tuning
Remove duplicate set in router
Refine animations