merge nicolas' 10x ui performance improvements