More ui enhancements