Waiver Styling Cleanup