Styling improvements for different filling states