Last batch of ui enhancements for now