Needs CSS rename and waiver styling updates