Refactoring. UI enhancements.