fixes

- Router
- View