Cleanup and minor changes to Article and Song views