ui enhancements continued