Fixed some merging problems in css.