UI improvements and more rebalancing.