line and bar fixes after merge