Work on making controls fit typographical grid