Fixing up the layouts, seeing what I can do about using underscore within underscore