fixing css redundancy and merging issues