Several ui enhancements.