Updating dependencies
Adding layouts and initial views
Fixing layouts and dataset