Please get this merge. 

...design and maybe fixes a rare ui bug.