Assets changes
Fix bugs on the template
Ordering changes