UI clean-up. Better status message handling