Start refactor router ui
Finish refactor router
Fix merge conflicts
Fix miss container div