Made progress on song search
- tweaked templates