Refactor css, tweak styles for bars