fixed up a few more layout issues