Refactored ui display.
Refactored.