added combo display and fixed song progress bar
resolve merge conflict