Underyxify design, and some other fixes, too