Changed dance display
Fixed various templates