Fixed some more layout issues.