Added album collapse from track, correct track display
Fixed album collapse focus issue