Update from bobafett CSS