Added add song button
Merged changes