few ui enhancements