Almost there

Here is a revised version of the layout that I think I will use. I hope it doesn't change much since I have already started drawing it out on the platform.