*I think* I fixed the layout problems.