UI updates, and better relevancy
merge
another merge