Minor UI enhancements
Untrack external dependencies