progress on my GB&W layout update