Additional fixes and ui enhancements.