minor fix/minor ui enhancements