Semi-fixed the highlighting of selected bars. Add a bar after the last bar if there is only 1 bar