Merge CSS from Frontend Branch