fix bootstrap button border spacing issue & update connect-bar dropdown styles
fix merge conflict