Layout and silk screen tweaks