minor UI changes per requested!