fix

- Component Router
- Remove Template