js and bar design
resolved conflicts