Added prev and next track, refactored