Improved UI status handling.
Some fixes for UI status handling.