Continued UI updates
Moved to a cleaner output generation