Merging new admin changes, and approved song only display.