Converted templates from a nested tree parent to many-to-many
Fixed Jaxx's player
Fixed component template sorting
Various template fixes for display