Update main css to resolve conflcits