Fixing layouts and dataset