Revert changes on Songs view to fix crashes