Getting closer to a workable layout.