Need to make sure element visuals are consistent during states changes.

Review by anonymous client