updated styles, primarily for progressbar
fixed merged conflicts with CSS