small ui enhancements and fixes