more ui enhancements