minor ux updates
Merge commit '72a5fd7abfa60aa9b9845c437259c07daae950cf' into HEAD