a lot of touch ups to the layouts, hope they work well