minor ui and display tweak
some refactoring