Add artist and song templates, factor out bottom controls