A few tweaks to improve the layout.  Still not sorted silk screen.