UI current state improvements.