Shay design tweaks