fixed css issues from the css merge