Added sorting
Added SongView