fixed a few more layout issues