ui refinements
ui improvements and refactoring in reaction to code reviews