Refactored UI Views with Routers