Continued layout updates, pt. 2

Also includes a separate folder to preserve the greyscale version of the
layout