List of changes:
- fix inside views