some enhancements to UI