Updated with new CSS