Cleanup
WIP: Work with resolve in nested views.