State fixes for UI and CSS interaction