Standardizing the final part of element state layout. No functional changes