Adding dynamic folder display
Fixing model definitions