Done. I agree with Geo.
Also, was it geared towards students attending course in English? I had to chose too many "Lagu Hudaina" options.