Patch up some issues creating the intended layout design