Embed some templates
Declare controllers separately
Allow to delete an extra
Use an extra
Update tracks in map
Fix typo
Bind some properties of a map instead of binding a map itself